roles/authelia/cfg.schema.json

@@ -369,13 +369,7 @@
 							"userinfo"
 						]
 					},
-					"default": [
+					"default": null
-						"authorization",
-						"token",
-						"revocation",
-						"introspection",
-						"userinfo"
-					]
 				}
 			},
 			"additionalProperties": false,

roles/authelia/defaults/main.json

@@ -46,13 +46,7 @@
 				"custom": {
 				}
 			},
-			"cors_endpoints": [
+			"cors_endpoints": null
-				"authorization",
-				"token",
-				"revocation",
-				"introspection",
-				"userinfo"
-			]
 		}
 	}
 }

roles/nginx/cfg.schema.json

@@ -1,20 +0,0 @@
-{
-	"nullable": false,
-	"type": "object",
-	"properties": {
-		"auto_reload_interval": {
-			"nullable": true,
-			"type": "integer",
-			"description": "in hours",
-			"default": null
-		},
-		"improved_security": {
-			"nullable": false,
-			"type": "boolean",
-			"default": false
-		}
-	},
-	"additionalProperties": false,
-	"required": [
-	]
-}

roles/nginx/defaults/main.json

@@ -1,6 +1,3 @@
 {
-	"cfg_nginx_defaults": {
+	"var_nginx_auto_reload_interval": null
-		"auto_reload_interval": null,
-		"improved_security": false
-	}
 }

roles/nginx/tasks/main.json

@@ -1,10 +1,4 @@
 [
-	{
-		"name": "show vars",
-		"ansible.builtin.debug": {
-			"var": "vars"
-		}
-	},
 	{
 		"name": "install packages",
 		"become": true,
@@ -18,7 +12,6 @@
 	},
 	{
 		"name": "generate dhparams file",
-		"when": "cfg_nginx.improved_security",
 		"become": true,
 		"ansible.builtin.command": {
 			"cmd": "openssl dhparam -out /etc/nginx/dhparam 4096"
@@ -29,7 +22,6 @@
 	},
 	{
 		"name": "place hardening config",
-		"when": "cfg_nginx.improved_security",
 		"become": true,
 		"ansible.builtin.copy": {
 			"src": "ssl-hardening.conf",
@@ -67,13 +59,13 @@
 	},
 	{
 		"name": "auto reload",
-		"when": "cfg_nginx.auto_reload_interval == None",
+		"when": "var_nginx_auto_reload_interval == None",
 		"become": true,
 		"ansible.builtin.cron": {
 			"name": "nginx_auto_reload",
 			"disabled": true,
 			"minute": "0",
-			"hour": "*/{{cfg_nginx.auto_reload_interval | string}}",
+			"hour": "*/{{var_nginx_auto_reload_interval | string}}",
 			"day": "*",
 			"month": "*",
 			"weekday": "*",
@@ -82,13 +74,13 @@
 	},
 	{
 		"name": "auto reload",
-		"when": "cfg_nginx.auto_reload_interval != None",
+		"when": "var_nginx_auto_reload_interval != None",
 		"become": true,
 		"ansible.builtin.cron": {
 			"name": "nginx_auto_reload",
 			"disabled": false,
 			"minute": "0",
-			"hour": "*/{{cfg_nginx.auto_reload_interval | string}}",
+			"hour": "*/{{var_nginx_auto_reload_interval | string}}",
 			"day": "*",
 			"month": "*",
 			"weekday": "*",

roles/nginx/vardef.json

@@ -0,0 +1,8 @@
+{
+	"auto_reload_interval": {
+		"description": "in hours",
+		"nullable": true,
+		"type": "integer",
+		"mandatory": false
+	}
+}