[res]

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"
 }

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
+}

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
+	}
+}

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"
 }

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
+}

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
+	}
+}

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"
 }

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
+}

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"
 }

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
+}

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"
 }

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
+}

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
+	}
+}

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"
 }

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
+}

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
+	}
+}

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"
 }

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
+}

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
+	}
+}