diff --git a/roles/authelia-for-hedgedoc/cfg.schema.json b/roles/authelia-for-hedgedoc/cfg.schema.json index 03e83ff..b2da9bf 100644 --- a/roles/authelia-for-hedgedoc/cfg.schema.json +++ b/roles/authelia-for-hedgedoc/cfg.schema.json @@ -4,8 +4,7 @@ "properties": { "hedgedoc_url_base": { "nullable": false, - "type": "string", - "default": "https://hedgedoc.example.org" + "type": "string" }, "client_id": { "nullable": false, @@ -19,6 +18,7 @@ }, "additionalProperties": false, "required": [ + "hedgedoc_url_base", "client_secret" ] } diff --git a/roles/authelia-for-owncloud/cfg.schema.json b/roles/authelia-for-owncloud/cfg.schema.json index 42ae537..8df9dca 100644 --- a/roles/authelia-for-owncloud/cfg.schema.json +++ b/roles/authelia-for-owncloud/cfg.schema.json @@ -4,8 +4,7 @@ "properties": { "owncloud_url_base": { "nullable": false, - "type": "string", - "default": "https://owncloud.example.org" + "type": "string" }, "web": { "nullable": true, @@ -89,5 +88,6 @@ }, "additionalProperties": false, "required": [ + "owncloud_url_base" ] } diff --git a/roles/authelia-for-owncloud/defaults/main.json b/roles/authelia-for-owncloud/defaults/main.json index 71aba99..ad9f859 100644 --- a/roles/authelia-for-owncloud/defaults/main.json +++ b/roles/authelia-for-owncloud/defaults/main.json @@ -1,6 +1,5 @@ { "cfg_authelia_for_owncloud_defaults": { - "owncloud_url_base": "https://owncloud.example.org", "web": { "client_id": "owncloud_web" }, diff --git a/roles/sqlite-for-hedgedoc/cfg.schema.json b/roles/sqlite-for-hedgedoc/cfg.schema.json new file mode 100644 index 0000000..d6a5f43 --- /dev/null +++ b/roles/sqlite-for-hedgedoc/cfg.schema.json @@ -0,0 +1,19 @@ +{ + "nullable": false, + "type": "object", + "properties": { + "path": { + "nullable": false, + "type": "string", + "default": "/var/hedgedoc/data.sqlite" + }, + "user_name": { + "nullable": false, + "type": "string", + "default": "hedgedoc" + } + }, + "additionalProperties": false, + "required": [ + ] +} diff --git a/roles/sqlite-for-hedgedoc/defaults/main.json b/roles/sqlite-for-hedgedoc/defaults/main.json index e574eac..dcebc0b 100644 --- a/roles/sqlite-for-hedgedoc/defaults/main.json +++ b/roles/sqlite-for-hedgedoc/defaults/main.json @@ -1,4 +1,6 @@ { - "var_sqlite_for_hedgedoc_path": "/var/hedgedoc/data.sqlite", - "var_sqlite_for_hedgedoc_user_name": "hedgedoc" + "cfg_sqlite_for_hedgedoc": { + "path": "/var/hedgedoc/data.sqlite", + "user_name": "hedgedoc" + } } diff --git a/roles/sqlite-for-hedgedoc/tasks/main.json b/roles/sqlite-for-hedgedoc/tasks/main.json index 7495fca..e52c024 100644 --- a/roles/sqlite-for-hedgedoc/tasks/main.json +++ b/roles/sqlite-for-hedgedoc/tasks/main.json @@ -4,7 +4,7 @@ "become": true, "ansible.builtin.file": { "state": "directory", - "path": "{{var_sqlite_for_hedgedoc_path | dirname}}", + "path": "{{cfg_sqlite_for_hedgedocpath | dirname}}", "owner": "{{var_hedgedoc_user_name}}" } }, @@ -13,8 +13,8 @@ "become": true, "ansible.builtin.file": { "state": "touch", - "path": "{{var_sqlite_for_hedgedoc_path}}", - "owner": "{{var_sqlite_for_hedgedoc_user_name}}" + "path": "{{cfg_sqlite_for_hedgedocpath}}", + "owner": "{{cfg_sqlite_for_hedgedocuser_name}}" } } ] diff --git a/roles/sqlite-for-hedgedoc/vardef.json b/roles/sqlite-for-hedgedoc/vardef.json deleted file mode 100644 index e62f130..0000000 --- a/roles/sqlite-for-hedgedoc/vardef.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "path": { - "type": "string", - "mandatory": false - }, - "user_name": { - "type": "string", - "mandatory": false - } -}