From 8eed714d881df48bca5ea6ad3ba96bd5967ecbc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Fra=C3=9F?= Date: Tue, 7 Oct 2025 16:47:45 +0200 Subject: [PATCH] [int] --- roles/nginx/tasks/main.json | 2 +- roles/owncloud/cfg.schema.json | 97 +++++++++++++++++-------------- roles/owncloud/defaults/main.json | 10 +--- 3 files changed, 56 insertions(+), 53 deletions(-) diff --git a/roles/nginx/tasks/main.json b/roles/nginx/tasks/main.json index 2fba6a9..47d4246 100644 --- a/roles/nginx/tasks/main.json +++ b/roles/nginx/tasks/main.json @@ -66,7 +66,7 @@ "port": "443", "proto": "tcp" } - }, + } ] }, { diff --git a/roles/owncloud/cfg.schema.json b/roles/owncloud/cfg.schema.json index 0b4ed0b..1dde09d 100644 --- a/roles/owncloud/cfg.schema.json +++ b/roles/owncloud/cfg.schema.json @@ -32,67 +32,78 @@ "type": "string" }, "authentication": { - "nullable": false, - "type": "object", - "properties": { - "kind": { - "type": "string", - "enum": [ - "internal", - "authelia" - ], - "default": "internal" - }, - "data": { - "anyOf": [ - { + "anyOf": [ + { + "nullable": false, + "type": "object", + "properties": { + "kind": { + "type": "string", + "enum": ["internal"] + }, + "data": { "nullable": false, "type": "object", "properties": { - "authelia": { + }, + "additionalProperties": false, + "required": [ + ], + "default": { + } + } + }, + "additionalProperties": false, + "required": [ + "kind" + ] + }, + { + "nullable": false, + "type": "object", + "properties": { + "kind": { + "type": "string", + "enum": ["authelia"] + }, + "data": { + "nullable": false, + "type": "object", + "properties": { + "url_base": { "nullable": false, + "type": "string" + }, + "web": { + "nullable": true, "type": "object", "properties": { - "url_base": { - "nullable": false, - "type": "string" - }, - "web": { - "nullable": true, - "type": "object", - "properties": { - "client_id": { - "type": "string", - "mandatory": false, - "default": "owncloud_web" - } - }, - "additionalProperties": false, - "required": [ - ], - "default": { - } + "client_id": { + "type": "string", + "mandatory": false, + "default": "owncloud_web" } }, "additionalProperties": false, "required": [ - "url_base" - ] + ], + "default": { + } } }, "additionalProperties": false, "required": [ - "authelia" + "url_base" ] } + }, + "additionalProperties": false, + "required": [ + "kind", + "data" ] } - }, - "additionalProperties": false, - "required": [ - ], - "default": { - } + ] }, "public_share": { "nullable": false, diff --git a/roles/owncloud/defaults/main.json b/roles/owncloud/defaults/main.json index 0c24d09..94f4742 100644 --- a/roles/owncloud/defaults/main.json +++ b/roles/owncloud/defaults/main.json @@ -6,15 +6,7 @@ "platform": "linux-amd64", "domain": "owncloud.example.org", "authentication": { - "kind": "internal", - "data": { - "authelia": { - "url_base": "https://authelia.example.org", - "web": { - "client_id": "owncloud_web" - } - } - } + "kind": "internal" }, "public_share": { "password_necessity": "writable",