diff --git a/roles/authelia-and-nginx/defaults/main.json b/roles/authelia-and-nginx/defaults/main.json index e1d1396..0aaf1b7 100644 --- a/roles/authelia-and-nginx/defaults/main.json +++ b/roles/authelia-and-nginx/defaults/main.json @@ -1,4 +1,4 @@ { "var_authelia_and_nginx_domain": "authelia.example.org", - "var_authelia_and_nginx_tls_mode": "enable" + "var_authelia_and_nginx_tls_mode": "force" } diff --git a/roles/authelia-and-nginx/defaults/main.json.orig b/roles/authelia-and-nginx/defaults/main.json.orig new file mode 100644 index 0000000..45e49bb --- /dev/null +++ b/roles/authelia-and-nginx/defaults/main.json.orig @@ -0,0 +1,8 @@ +{ + "var_authelia_and_nginx_domain": "authelia.example.org", +<<<<<<< HEAD + "var_authelia_and_nginx_tls_mode": "enable" +======= + "var_authelia_and_nginx_tls_mode": "force" +>>>>>>> main +} diff --git a/roles/authelia-and-nginx/vardef.json b/roles/authelia-and-nginx/vardef.json index e1e1a74..b78ac7a 100644 --- a/roles/authelia-and-nginx/vardef.json +++ b/roles/authelia-and-nginx/vardef.json @@ -4,12 +4,12 @@ "mandatory": false }, "tls_mode": { - "type": "string", - "options": [ + "type": "string", + "options": [ "disable", "enable", "force" - ], - "mandatory": false + ], + "mandatory": false } } diff --git a/roles/authelia-and-nginx/vardef.json.orig b/roles/authelia-and-nginx/vardef.json.orig new file mode 100644 index 0000000..7b4f161 --- /dev/null +++ b/roles/authelia-and-nginx/vardef.json.orig @@ -0,0 +1,25 @@ +{ + "domain": { + "type": "string", + "mandatory": false + }, + "tls_mode": { +<<<<<<< HEAD + "type": "string", + "options": [ + "disable", + "enable", + "force" + ], + "mandatory": false +======= + "type": "string", + "options": [ + "disable", + "enable", + "force" + ], + "mandatory": false +>>>>>>> main + } +} diff --git a/roles/dokuwiki-and-nginx/defaults/main.json b/roles/dokuwiki-and-nginx/defaults/main.json index 05e1d7f..d500d18 100644 --- a/roles/dokuwiki-and-nginx/defaults/main.json +++ b/roles/dokuwiki-and-nginx/defaults/main.json @@ -1,5 +1,5 @@ { "var_dokuwiki_and_nginx_directory": "/opt/dokuwiki", "var_dokuwiki_and_nginx_domain": "dokuwiki.example.org", - "var_dokuwiki_and_nginx_tls_mode": "enable" + "var_dokuwiki_and_nginx_tls_mode": "force" } diff --git a/roles/dokuwiki-and-nginx/defaults/main.json.orig b/roles/dokuwiki-and-nginx/defaults/main.json.orig new file mode 100644 index 0000000..3fd9025 --- /dev/null +++ b/roles/dokuwiki-and-nginx/defaults/main.json.orig @@ -0,0 +1,9 @@ +{ + "var_dokuwiki_and_nginx_directory": "/opt/dokuwiki", + "var_dokuwiki_and_nginx_domain": "dokuwiki.example.org", +<<<<<<< HEAD + "var_dokuwiki_and_nginx_tls_mode": "enable" +======= + "var_dokuwiki_and_nginx_tls_mode": "force" +>>>>>>> main +} diff --git a/roles/dokuwiki-and-nginx/vardef.json b/roles/dokuwiki-and-nginx/vardef.json index a3fa777..8838525 100644 --- a/roles/dokuwiki-and-nginx/vardef.json +++ b/roles/dokuwiki-and-nginx/vardef.json @@ -8,12 +8,12 @@ "mandatory": false }, "tls_mode": { - "type": "string", - "options": [ + "type": "string", + "options": [ "disable", "enable", "force" - ], - "mandatory": false + ], + "mandatory": false } } diff --git a/roles/dokuwiki-and-nginx/vardef.json.orig b/roles/dokuwiki-and-nginx/vardef.json.orig new file mode 100644 index 0000000..b2b79c4 --- /dev/null +++ b/roles/dokuwiki-and-nginx/vardef.json.orig @@ -0,0 +1,29 @@ +{ + "directory": { + "type": "string", + "mandatory": false + }, + "domain": { + "type": "string", + "mandatory": false + }, + "tls_mode": { +<<<<<<< HEAD + "type": "string", + "options": [ + "disable", + "enable", + "force" + ], + "mandatory": false +======= + "type": "string", + "options": [ + "disable", + "enable", + "force" + ], + "mandatory": false +>>>>>>> main + } +} diff --git a/roles/element-and-nginx/defaults/main.json b/roles/element-and-nginx/defaults/main.json index 4c7e5b6..d9f8e46 100644 --- a/roles/element-and-nginx/defaults/main.json +++ b/roles/element-and-nginx/defaults/main.json @@ -1,5 +1,5 @@ { "var_element_and_nginx_domain": "element.example.org", "var_element_and_nginx_path": "/opt/element", - "var_element_and_nginx_tls_mode": "enable" + "var_element_and_nginx_tls_mode": "force" } diff --git a/roles/element-and-nginx/defaults/main.json.orig b/roles/element-and-nginx/defaults/main.json.orig new file mode 100644 index 0000000..eb35196 --- /dev/null +++ b/roles/element-and-nginx/defaults/main.json.orig @@ -0,0 +1,9 @@ +{ + "var_element_and_nginx_domain": "element.example.org", + "var_element_and_nginx_path": "/opt/element", +<<<<<<< HEAD + "var_element_and_nginx_tls_mode": "enable" +======= + "var_element_and_nginx_tls_mode": "force" +>>>>>>> main +} diff --git a/roles/gitlab-and-nginx/defaults/main.json b/roles/gitlab-and-nginx/defaults/main.json index 4f0da06..2fc356f 100644 --- a/roles/gitlab-and-nginx/defaults/main.json +++ b/roles/gitlab-and-nginx/defaults/main.json @@ -1,5 +1,5 @@ { "var_gitlab_and_nginx_domain": "element.example.org", "var_gitlab_and_nginx_path": "/opt/element", - "var_gitlab_and_nginx_tls_mode": "enable" + "var_gitlab_and_nginx_tls_mode": "force" } diff --git a/roles/gitlab-and-nginx/defaults/main.json.orig b/roles/gitlab-and-nginx/defaults/main.json.orig new file mode 100644 index 0000000..20ce517 --- /dev/null +++ b/roles/gitlab-and-nginx/defaults/main.json.orig @@ -0,0 +1,9 @@ +{ + "var_gitlab_and_nginx_domain": "element.example.org", + "var_gitlab_and_nginx_path": "/opt/element", +<<<<<<< HEAD + "var_gitlab_and_nginx_tls_mode": "enable" +======= + "var_gitlab_and_nginx_tls_mode": "force" +>>>>>>> main +} diff --git a/roles/hedgedoc-and-nginx/defaults/main.json b/roles/hedgedoc-and-nginx/defaults/main.json index aab8b85..aec6aa3 100644 --- a/roles/hedgedoc-and-nginx/defaults/main.json +++ b/roles/hedgedoc-and-nginx/defaults/main.json @@ -1,4 +1,4 @@ { "var_hedgedoc_and_nginx_domain": "hedgedoc.example.org", - "var_hedgedoc_and_nginx_tls_mode": "enable" + "var_hedgedoc_and_nginx_tls_mode": "force" } diff --git a/roles/hedgedoc-and-nginx/defaults/main.json.orig b/roles/hedgedoc-and-nginx/defaults/main.json.orig new file mode 100644 index 0000000..9140f21 --- /dev/null +++ b/roles/hedgedoc-and-nginx/defaults/main.json.orig @@ -0,0 +1,8 @@ +{ + "var_hedgedoc_and_nginx_domain": "hedgedoc.example.org", +<<<<<<< HEAD + "var_hedgedoc_and_nginx_tls_mode": "enable" +======= + "var_hedgedoc_and_nginx_tls_mode": "force" +>>>>>>> main +} diff --git a/roles/hedgedoc-and-nginx/vardef.json b/roles/hedgedoc-and-nginx/vardef.json index e1e1a74..b78ac7a 100644 --- a/roles/hedgedoc-and-nginx/vardef.json +++ b/roles/hedgedoc-and-nginx/vardef.json @@ -4,12 +4,12 @@ "mandatory": false }, "tls_mode": { - "type": "string", - "options": [ + "type": "string", + "options": [ "disable", "enable", "force" - ], - "mandatory": false + ], + "mandatory": false } } diff --git a/roles/hedgedoc-and-nginx/vardef.json.orig b/roles/hedgedoc-and-nginx/vardef.json.orig new file mode 100644 index 0000000..7b4f161 --- /dev/null +++ b/roles/hedgedoc-and-nginx/vardef.json.orig @@ -0,0 +1,25 @@ +{ + "domain": { + "type": "string", + "mandatory": false + }, + "tls_mode": { +<<<<<<< HEAD + "type": "string", + "options": [ + "disable", + "enable", + "force" + ], + "mandatory": false +======= + "type": "string", + "options": [ + "disable", + "enable", + "force" + ], + "mandatory": false +>>>>>>> main + } +} diff --git a/roles/synapse-and-nginx/defaults/main.json b/roles/synapse-and-nginx/defaults/main.json index e504fa6..cd7ab01 100644 --- a/roles/synapse-and-nginx/defaults/main.json +++ b/roles/synapse-and-nginx/defaults/main.json @@ -1,4 +1,4 @@ { "var_synapse_and_nginx_domain": "REPLACE_ME", - "var_synapse_and_nginx_tls_mode": "enable" + "var_synapse_and_nginx_tls_mode": "force" } diff --git a/roles/synapse-and-nginx/defaults/main.json.orig b/roles/synapse-and-nginx/defaults/main.json.orig new file mode 100644 index 0000000..b7d6849 --- /dev/null +++ b/roles/synapse-and-nginx/defaults/main.json.orig @@ -0,0 +1,8 @@ +{ + "var_synapse_and_nginx_domain": "REPLACE_ME", +<<<<<<< HEAD + "var_synapse_and_nginx_tls_mode": "enable" +======= + "var_synapse_and_nginx_tls_mode": "force" +>>>>>>> main +} diff --git a/roles/synapse-and-nginx/vardef.json b/roles/synapse-and-nginx/vardef.json index e1e1a74..b78ac7a 100644 --- a/roles/synapse-and-nginx/vardef.json +++ b/roles/synapse-and-nginx/vardef.json @@ -4,12 +4,12 @@ "mandatory": false }, "tls_mode": { - "type": "string", - "options": [ + "type": "string", + "options": [ "disable", "enable", "force" - ], - "mandatory": false + ], + "mandatory": false } } diff --git a/roles/synapse-and-nginx/vardef.json.orig b/roles/synapse-and-nginx/vardef.json.orig new file mode 100644 index 0000000..7b4f161 --- /dev/null +++ b/roles/synapse-and-nginx/vardef.json.orig @@ -0,0 +1,25 @@ +{ + "domain": { + "type": "string", + "mandatory": false + }, + "tls_mode": { +<<<<<<< HEAD + "type": "string", + "options": [ + "disable", + "enable", + "force" + ], + "mandatory": false +======= + "type": "string", + "options": [ + "disable", + "enable", + "force" + ], + "mandatory": false +>>>>>>> main + } +} diff --git a/roles/vikunja-and-nginx/defaults/main.json b/roles/vikunja-and-nginx/defaults/main.json index 494801c..63610a2 100644 --- a/roles/vikunja-and-nginx/defaults/main.json +++ b/roles/vikunja-and-nginx/defaults/main.json @@ -1,4 +1,4 @@ { "var_vikunja_and_nginx_domain": "vikunja.example.org", - "var_vikunja_and_nginx_tls_mode": "enable" + "var_vikunja_and_nginx_tls_mode": "force" } diff --git a/roles/vikunja-and-nginx/defaults/main.json.orig b/roles/vikunja-and-nginx/defaults/main.json.orig new file mode 100644 index 0000000..229204a --- /dev/null +++ b/roles/vikunja-and-nginx/defaults/main.json.orig @@ -0,0 +1,8 @@ +{ + "var_vikunja_and_nginx_domain": "vikunja.example.org", +<<<<<<< HEAD + "var_vikunja_and_nginx_tls_mode": "enable" +======= + "var_vikunja_and_nginx_tls_mode": "force" +>>>>>>> main +} diff --git a/roles/vikunja-and-nginx/vardef.json b/roles/vikunja-and-nginx/vardef.json index e1e1a74..b78ac7a 100644 --- a/roles/vikunja-and-nginx/vardef.json +++ b/roles/vikunja-and-nginx/vardef.json @@ -4,12 +4,12 @@ "mandatory": false }, "tls_mode": { - "type": "string", - "options": [ + "type": "string", + "options": [ "disable", "enable", "force" - ], - "mandatory": false + ], + "mandatory": false } } diff --git a/roles/vikunja-and-nginx/vardef.json.orig b/roles/vikunja-and-nginx/vardef.json.orig new file mode 100644 index 0000000..7b4f161 --- /dev/null +++ b/roles/vikunja-and-nginx/vardef.json.orig @@ -0,0 +1,25 @@ +{ + "domain": { + "type": "string", + "mandatory": false + }, + "tls_mode": { +<<<<<<< HEAD + "type": "string", + "options": [ + "disable", + "enable", + "force" + ], + "mandatory": false +======= + "type": "string", + "options": [ + "disable", + "enable", + "force" + ], + "mandatory": false +>>>>>>> main + } +}