[fix] role:authelia-for-gitea

[fix] role:gitea
2024-07-09 17:54:58 +02:00 · 2024-07-09 17:35:20 +02:00 · 2024-07-09 17:30:46 +02:00 · 2024-07-09 17:12:01 +02:00 · 2024-07-09 17:10:54 +02:00 · 2024-07-09 14:12:35 +02:00
149 changed files with 921 additions and 4805 deletions
--- a/README.md
+++ b/README.md
@ -1,4 +1,4 @@
-# Ansible Collection - roydfalk.standard
+# Ansible Collection - linke.standard
 Sammlung von allgemeinen, wiederverwendbaren Ansible-Rollen
--- a/galaxy.yml
+++ b/galaxy.yml
@ -2,10 +2,10 @@
 # The namespace of the collection. This can be a company/brand/organization or product namespace under which all
 # content lives. May only contain alphanumeric lowercase characters and underscores. Namespaces cannot start with
 # underscores or numbers and cannot contain consecutive underscores
-namespace: fenris 
+namespace: linke
 # The name of the collection. Has the same character restrictions as 'namespace'
-name: base 
+name: standard
 # The version of the collection. Must be compatible with semantic versioning
 version: 1.0.0
@ -16,12 +16,12 @@ readme: README.md
 # A list of the collection's content authors. Can be just the name or in the format 'Full Name <email> (url)
 # @nicks:irc/im.site#channel'
 authors:
- Fenris <fenris@folksprak.org>
+- Royd Falk <roydfalk@folksprak.org>
 - Marius <marius@rasumi.net>
 ### OPTIONAL but strongly recommended
 # A short summary description of the collection
-description: "Sammlung von allgemeinen, wiederverwendbaren Ansible-Rollen"
+description: "Sammlung von allgemeinen, wiederverwendbaren Ansible-Rollen (ursprünglich für Infrastruktur der Partei 'DIE LINKE.')"
 # Either a single license or a list of licenses for content inside of a collection. Ansible Galaxy currently only
 # accepts L(SPDX,https://spdx.org/licenses/) licenses. This key is mutually exclusive with 'license_file'
--- a/roles/authelia-and-nginx/cfg.schema.json
+++ b/roles/authelia-and-nginx/cfg.schema.json
@ -1,24 +0,0 @@
 {
 	"nullable": false,
 	"type": "object",
 	"properties": {
 		"domain": {
 			"nullable": false,
 			"type": "string"
 		},
 		"tls_mode": {
 			"nullable": false,
 			"type": "string",
 			"options": [
 				"disable",
 				"enable",
 				"force"
 			],
 			"enum": "force"
 		}
 	},
 	"additionalProperties": false,
 	"required": [
 		"domain"
 	]
 }
--- a/roles/authelia-and-nginx/defaults/main.json
+++ b/roles/authelia-and-nginx/defaults/main.json
@ -1,5 +1,4 @@
 {
-	"cfg_authelia_and_nginx_defaults": {
+	"var_authelia_and_nginx_domain": "authelia.example.org",
-		"tls_mode": "force"
+	"var_authelia_and_nginx_tls_mode": "enable"
 	}
 }
--- a/roles/authelia-and-nginx/tasks/main.json
+++ b/roles/authelia-and-nginx/tasks/main.json
@ -1,11 +1,4 @@
 [
 	{
 		"name": "show vars",
 		"when": "switch_show_vars",
 		"ansible.builtin.debug": {
 			"var": "vars.cfg_authelia_and_nginx"
 		}
 	},
 	{
 		"name": "deactivate default site",
 		"become": true,
@ -19,7 +12,7 @@
 		"become": true,
 		"ansible.builtin.template": {
 			"src": "conf.j2",
-			"dest": "/etc/nginx/sites-available/{{cfg_authelia_and_nginx.domain}}"
+			"dest": "/etc/nginx/sites-available/{{var_authelia_and_nginx_domain}}"
 		}
 	},
 	{
@ -27,8 +20,8 @@
 		"become": true,
 		"ansible.builtin.file": {
 			"state": "link",
-			"src": "/etc/nginx/sites-available/{{cfg_authelia_and_nginx.domain}}",
+			"src": "/etc/nginx/sites-available/{{var_authelia_and_nginx_domain}}",
-			"dest": "/etc/nginx/sites-enabled/{{cfg_authelia_and_nginx.domain}}"
+			"dest": "/etc/nginx/sites-enabled/{{var_authelia_and_nginx_domain}}"
 		}
 	},
 	{
--- a/roles/authelia-and-nginx/templates/conf.j2
+++ b/roles/authelia-and-nginx/templates/conf.j2
@ -45,27 +45,27 @@
 {% endmacro %}
 server {
-	server_name {{cfg_authelia_and_nginx.domain}};
+	server_name {{var_authelia_and_nginx_domain}};
 	listen 80;
 	listen [::]:80;
-{% if (cfg_authelia_and_nginx.tls_mode == 'force') %}
+{% if (var_authelia_and_nginx_tls_mode == 'force') %}
 	return 301 https://$http_host$request_uri;
 {% else %}
 {{ authelia_common() }}
 {% endif %}
 }
-{% if (cfg_authelia_and_nginx.tls_mode != 'disable') %}
+{% if (var_authelia_and_nginx_tls_mode != 'disable') %}
 server {
-	server_name {{cfg_authelia_and_nginx.domain}};
+	server_name {{var_authelia_and_nginx_domain}};
 	listen [::]:443 ssl http2;
 	listen 443 ssl http2;
-	ssl_certificate_key /etc/ssl/private/{{cfg_authelia_and_nginx.domain}}.pem;
+	ssl_certificate_key /etc/ssl/private/{{var_authelia_and_nginx_domain}}.pem;
-	ssl_certificate /etc/ssl/fullchains/{{cfg_authelia_and_nginx.domain}}.pem;
+	ssl_certificate /etc/ssl/fullchains/{{var_authelia_and_nginx_domain}}.pem;
 	include /etc/nginx/ssl-hardening.conf;
 {{ authelia_common() }}
--- a/roles/authelia-and-nginx/vardef.json
+++ b/roles/authelia-and-nginx/vardef.json
@ -0,0 +1,15 @@
 {
 	"domain": {
 		"type": "string",
 		"mandatory": false
 	},
 	"tls_mode": {
        "type": "string",
        "options": [
 			"disable",
 			"enable",
 			"force"
        ],
        "mandatory": false
 	}
 }
--- a/roles/authelia-for-dokuwiki/tasks/main.json
+++ b/roles/authelia-for-dokuwiki/tasks/main.json
@ -1,12 +1,4 @@
 [
 	{
 		"name": "configuration | compute client secret hash",
 		"become": true,
 		"ansible.builtin.shell": {
 			"cmd": "authelia crypto hash generate bcrypt --password {{var_authelia_for_dokuwiki_client_secret}} | cut --delimiter=' ' --fields='2-'"
 		},
 		"register": "temp_authelia_for_dokuwiki_client_secret_hashed"
 	},
 	{
 		"name": "configuration | emplace",
 		"become": true,
--- a/roles/authelia-for-dokuwiki/templates/authelia-client-conf.json.j2
+++ b/roles/authelia-for-dokuwiki/templates/authelia-client-conf.json.j2
@ -1,6 +1,6 @@
 {
 	"client_id": "{{var_authelia_for_dokuwiki_client_id}}",
-	"client_secret": "{{temp_authelia_for_dokuwiki_client_secret_hashed.stdout}}",
+	"client_secret": "{{var_authelia_for_dokuwiki_client_secret}}",
 	"client_name": "DokuWiki",
 	"public": false,
 	"authorization_policy": "one_factor",
--- a/roles/authelia-for-forgejo/defaults/main.json
+++ b/roles/authelia-for-forgejo/defaults/main.json
@ -1,5 +0,0 @@
 {
 	"var_authelia_for_forgejo_forgejo_url_base": "https://forgejo.example.org",
 	"var_authelia_for_forgejo_client_id": "forgejo",
 	"var_authelia_for_forgejo_client_secret": "REPLACE_ME"
 }
--- a/roles/authelia-for-forgejo/info.md
+++ b/roles/authelia-for-forgejo/info.md
@ -1,9 +0,0 @@
 ## Beschreibung
 Um [Forgejo](../forgejo) gegen [Authelia](../authelia) authentifizieren zu lassen
 ## Verweise
 - [Forgejo-Dokumentation | Configuration | OpenID](https://forgejo.org/docs/latest/admin/config-cheat-sheet/#openid-openid)
 - [Authelia-Dokumentation | Gitea Integration](https://www.authelia.com/integration/openid-connect/gitea/)
--- a/roles/authelia-for-forgejo/tasks/main.json
+++ b/roles/authelia-for-forgejo/tasks/main.json
@ -1,33 +0,0 @@
 [
 	{
 		"name": "configuration | compute client secret hash",
 		"become": true,
 		"ansible.builtin.shell": {
 			"cmd": "authelia crypto hash generate bcrypt --password {{var_authelia_for_forgejo_client_secret}} | cut --delimiter=' ' --fields='2-'"
 		},
 		"register": "temp_authelia_for_forgejo_client_secret_hashed"
 	},
 	{
 		"name": "configuration | emplace",
 		"become": true,
 		"ansible.builtin.template": {
 			"src": "authelia-client-conf.json.j2",
 			"dest": "/etc/authelia/conf.d/clients/forgejo.json"
 		}
 	},
 	{
 		"name": "configuration | apply",
 		"become": true,
 		"ansible.builtin.command": {
 			"cmd": "/usr/bin/authelia-conf-compose"
 		}
 	},
 	{
 		"name": "restart service",
 		"become": true,
 		"ansible.builtin.systemd_service": {
 			"state": "restarted",
 			"name": "authelia"
 		}
 	}
 ]
--- a/roles/authelia-for-forgejo/templates/authelia-client-conf.json.j2
+++ b/roles/authelia-for-forgejo/templates/authelia-client-conf.json.j2
@ -1,17 +0,0 @@
 {
 	"client_id": "{{var_authelia_for_forgejo_client_id}}",
 	"client_secret": "{{temp_authelia_for_forgejo_client_secret_hashed.stdout}}",
 	"client_name": "Forgejo",
 	"public": false,
 	"authorization_policy": "one_factor",
 	"redirect_uris": [
 		"{{var_authelia_for_forgejo_forgejo_url_base}}/user/oauth2/authelia/callback"
 	],
 	"scopes": [
 		"openid",
 		"email",
 		"profile"
 	],
 	"userinfo_signed_response_alg": "none",
 	"token_endpoint_auth_method": "client_secret_basic"
 }
--- a/roles/authelia-for-gitea/defaults/main.json
+++ b/roles/authelia-for-gitea/defaults/main.json
@ -0,0 +1,5 @@
 {
 	"var_authelia_for_gitea_gitea_url_base": "https://gitea.example.org",
 	"var_authelia_for_gitea_client_id": "gitea",
 	"var_authelia_for_gitea_client_secret": "REPLACE_ME"
 }
--- a/roles/authelia-for-gitea/info.md
+++ b/roles/authelia-for-gitea/info.md
@ -0,0 +1,9 @@
 ## Beschreibung
 Um [Gitea](../gitea) gegen [Authelia](../authelia) authentifizieren zu lassen
 ## Verweise
 - [Gitea-Dokumentation | Configuration | OpenID](https://docs.gitea.com/administration/config-cheat-sheet#openid-openid)
 - [Authelia-Dokumentation | Gitea Integration](https://www.authelia.com/integration/openid-connect/gitea/)
--- a/roles/authelia-for-wiki_js/tasks/main.json
+++ b/roles/authelia-for-wiki_js/tasks/main.json
@ -1,18 +1,10 @@
 [
 	{
 		"name": "configuration | compute client secret hash",
 		"become": true,
 		"ansible.builtin.shell": {
 			"cmd": "authelia crypto hash generate bcrypt --password {{var_authelia_for_wiki_js_client_secret}} | cut --delimiter=' ' --fields='2-'"
 		},
 		"register": "temp_authelia_for_wiki_js_client_secret_hashed"
 	},
 	{
 		"name": "configuration | emplace",
 		"become": true,
 		"ansible.builtin.template": {
 			"src": "authelia-client-conf.json.j2",
-			"dest": "/etc/authelia/conf.d/clients/wiki_js.json"
+			"dest": "/etc/authelia/conf.d/clients/gitea.json"
 		}
 	},
 	{
--- a/roles/authelia-for-gitea/templates/authelia-client-conf.json.j2
+++ b/roles/authelia-for-gitea/templates/authelia-client-conf.json.j2
@ -0,0 +1,17 @@
 {
 	"client_id": "{{var_authelia_for_gitea_client_id}}",
 	"client_secret": "{{var_authelia_for_gitea_client_secret}}",
 	"client_name": "Gitea",
 	"public": false,
 	"authorization_policy": "one_factor",
 	"redirect_uris": [
 		"{{var_authelia_for_gitea_gitea_url_base}}/user/oauth2/authelia/callback"
 	],
 	"scopes": [
 		"openid",
 		"email",
 		"profile"
 	],
 	"userinfo_signed_response_alg": "none",
 	"token_endpoint_auth_method": "client_secret_basic"
 }
--- a/roles/authelia-for-gitlab/tasks/main.json
+++ b/roles/authelia-for-gitlab/tasks/main.json
@ -1,12 +1,4 @@
 [
 	{
 		"name": "configuration | compute client secret hash",
 		"become": true,
 		"ansible.builtin.shell": {
 			"cmd": "authelia crypto hash generate bcrypt --password {{var_authelia_for_gitlab_client_secret}} | cut --delimiter=' ' --fields='2-'"
 		},
 		"register": "temp_authelia_for_gitlab_client_secret_hashed"
 	},
 	{
 		"name": "configuration | emplace",
 		"become": true,
--- a/roles/authelia-for-gitlab/templates/authelia-client-conf.json.j2
+++ b/roles/authelia-for-gitlab/templates/authelia-client-conf.json.j2
@ -1,6 +1,6 @@
 {
 	"client_id": "{{var_authelia_for_gitlab_client_id}}",
-	"client_secret": "{{temp_authelia_for_gitlab_client_secret_hashed.stdout}}",
+	"client_secret": "{{var_authelia_for_gitlab_client_secret}}",
 	"client_name": "GitLab",
 	"public": false,
 	"authorization_policy": "one_factor",
--- a/roles/authelia-for-hedgedoc/cfg.schema.json
+++ b/roles/authelia-for-hedgedoc/cfg.schema.json
@ -1,25 +0,0 @@
 {
 	"nullable": false,
 	"type": "object",
 	"properties": {
 		"hedgedoc_url_base": {
 			"nullable": false,
 			"type": "string"
 		},
 		"client_id": {
 			"nullable": false,
 			"type": "string",
 			"default": "hedgedoc"
 		},
 		"client_secret": {
 			"nullable": false,
 			"type": "string"
 		}
 	},
 	"additionalProperties": false,
 	"required": [
 		"hedgedoc_url_base",
 		"client_id",
 		"client_secret"
 	]
 }
--- a/roles/authelia-for-hedgedoc/defaults/main.json
+++ b/roles/authelia-for-hedgedoc/defaults/main.json
@ -1,5 +1,5 @@
 {
-	"cfg_authelia_for_hedgedoc_defaults": {
+	"var_authelia_for_hedgedoc_hedgedoc_url_base": "https://hedgedoc.example.org",
-		"client_id": "hedgedoc"
+	"var_authelia_for_hedgedoc_client_id": "hedgedoc",
-	}
+	"var_authelia_for_hedgedoc_client_secret": "REPLACE_ME"
 }
--- a/roles/authelia-for-hedgedoc/tasks/main.json
+++ b/roles/authelia-for-hedgedoc/tasks/main.json
@ -1,19 +1,4 @@
 [
 	{
 		"name": "show vars",
 		"when": "switch_show_vars",
 		"ansible.builtin.debug": {
 			"var": "vars.cfg_authelia_for_hedgedoc"
 		}
 	},
 	{
 		"name": "configuration | compute client secret hash",
 		"become": true,
 		"ansible.builtin.shell": {
 			"cmd": "authelia crypto hash generate bcrypt --password {{cfg_authelia_for_hedgedoc.client_secret}} | cut --delimiter=' ' --fields='2-'"
 		},
 		"register": "temp_authelia_for_hedgedoc_client_secret_hashed"
 	},
 	{
 		"name": "configuration | emplace",
 		"become": true,
--- a/roles/authelia-for-hedgedoc/templates/authelia-client-conf.json.j2
+++ b/roles/authelia-for-hedgedoc/templates/authelia-client-conf.json.j2
@ -1,6 +1,6 @@
 {
-	"client_id": "{{cfg_authelia_for_hedgedoc.client_id}}",
+	"client_id": "{{var_authelia_for_hedgedoc_client_id}}",
-	"client_secret": "{{temp_authelia_for_hedgedoc_client_secret_hashed.stdout}}",
+	"client_secret": "{{var_authelia_for_hedgedoc_client_secret}}",
 	"client_name": "Hedgedoc",
 	"public": false,
 	"authorization_policy": "one_factor",
@ -10,7 +10,11 @@
 		"profile"
 	],
 	"redirect_uris": [
-		"{{cfg_authelia_for_hedgedoc.hedgedoc_url_base}}/auth/oauth2/callback"
+		"{{var_authelia_for_hedgedoc_hedgedoc_url_base}}/auth/oauth2/callback"
 	],
 	"grant_types": [
 		"refresh_token",
 		"authorization_code"
 	],
 	"response_types": [
 		"code"
--- a/roles/authelia-for-owncloud/cfg.schema.json
+++ b/roles/authelia-for-owncloud/cfg.schema.json
@ -1,97 +0,0 @@
 {
 	"nullable": false,
 	"type": "object",
 	"properties": {
 		"owncloud_url_base": {
 			"nullable": false,
 			"type": "string"
 		},
 		"web": {
 			"nullable": true,
 			"type": "object",
 			"properties": {
 				"client_id": {
 					"nullable": false,
 					"type": "string",
 					"default": "owncloud_web"
 				}
 			},
 			"additionalProperties": false,
 			"required": [
 			],
 			"default": {
 			}
 		},
 		"desktop": {
 			"nullable": true,
 			"type": "object",
 			"properties": {
 				"client_id": {
 					"nullable": false,
 					"type": "string",
 					"default": "xdXOt13JKxym1B1QcEncf2XDkLAexMBFwiT9j6EfhhHFJhs2KM9jbjTmf8JBXE69"
 				},
 				"client_secret": {
 					"nullable": false,
 					"type": "string",
 					"default": "UBntmLjC2yYCeHwsyj73Uwo9TAaecAetRwMw0xYcvNL9yRdLSUi0hUAHfvCHFeFh"
 				}
 			},
 			"additionalProperties": false,
 			"required": [
 			],
 			"default": {
 			}
 		},
 		"android": {
 			"nullable": true,
 			"type": "object",
 			"properties": {
 				"client_id": {
 					"nullable": false,
 					"type": "string",
 					"default": "e4rAsNUSIUs0lF4nbv9FmCeUkTlV9GdgTLDH1b5uie7syb90SzEVrbN7HIpmWJeD"
 				},
 				"client_secret": {
 					"nullable": false,
 					"type": "string",
 					"default": "dInFYGV33xKzhbRmpqQltYNdfLdJIfJ9L5ISoKhNoT9qZftpdWSP71VrpGR9pmoD"
 				}
 			},
 			"additionalProperties": false,
 			"required": [
 			],
 			"default": {
 			}
 		},
 		"ios": {
 			"nullable": true,
 			"type": "object",
 			"properties": {
 				"client_id": {
 					"nullable": false,
 					"type": "string",
 					"default": "mxd5OQDk6es5LzOzRvidJNfXLUZS2oN3oUFeXPP8LpPrhx3UroJFduGEYIBOxkY1"
 				},
 				"client_secret": {
 					"nullable": false,
 					"type": "string",
 					"default": "KFeFWWEZO9TkisIQzR3fo7hfiMXlOpaqP8CFuTbSHzV1TUuGECglPxpiVKJfOXIx"
 				}
 			},
 			"additionalProperties": false,
 			"required": [
 			],
 			"default": {
 			}
 		}
 	},
 	"additionalProperties": false,
 	"required": [
 		"owncloud_url_base",
 		"web",
 		"desktop",
 		"android",
 		"ios"
 	]
 }
--- a/roles/authelia-for-owncloud/defaults/main.json
+++ b/roles/authelia-for-owncloud/defaults/main.json
@ -1,19 +0,0 @@
 {
 	"cfg_authelia_for_owncloud_defaults": {
 		"web": {
 			"client_id": "owncloud_web"
 		},
 		"desktop": {
 			"client_id": "xdXOt13JKxym1B1QcEncf2XDkLAexMBFwiT9j6EfhhHFJhs2KM9jbjTmf8JBXE69",
 			"client_secret": "UBntmLjC2yYCeHwsyj73Uwo9TAaecAetRwMw0xYcvNL9yRdLSUi0hUAHfvCHFeFh"
 		},
 		"android": {
 			"client_id": "e4rAsNUSIUs0lF4nbv9FmCeUkTlV9GdgTLDH1b5uie7syb90SzEVrbN7HIpmWJeD",
 			"client_secret": "dInFYGV33xKzhbRmpqQltYNdfLdJIfJ9L5ISoKhNoT9qZftpdWSP71VrpGR9pmoD"
 		},
 		"ios": {
 			"client_id": "mxd5OQDk6es5LzOzRvidJNfXLUZS2oN3oUFeXPP8LpPrhx3UroJFduGEYIBOxkY1",
 			"client_secret": "KFeFWWEZO9TkisIQzR3fo7hfiMXlOpaqP8CFuTbSHzV1TUuGECglPxpiVKJfOXIx"
 		}
 	}
 }
--- a/roles/authelia-for-owncloud/info.md
+++ b/roles/authelia-for-owncloud/info.md
@ -1,10 +0,0 @@
 ## Beschreibung
 Um [ownCloud](../owncloud) gegen [Authelia](../authelia) authentifizieren zu lassen
 ## Verweise
 - [Authelia-Dokumentation | ownCloud Infinite Scale Integration](https://www.authelia.com/integration/openid-connect/ocis/)
 - [Helge Klein | SSO via Authelia: ownCloud OpenID Connect Authentication](https://helgeklein.com/blog/owncloud-infinite-scale-with-openid-connect-authentication-for-home-networks/#sso-via-authelia-owncloud-openid-connect-authentication)
 - [ownCloud Forums | OCIS + Authelia](https://central.owncloud.org/t/ocis-authelia/44222)
--- a/roles/authelia-for-owncloud/tasks/main.json
+++ b/roles/authelia-for-owncloud/tasks/main.json
@ -1,109 +0,0 @@
 [
 	{
 		"name": "show vars",
 		"when": "switch_show_vars",
 		"ansible.builtin.debug": {
 			"var": "vars.cfg_authelia_for_owncloud"
 		}
 	},
 	{
 		"name": "configuration | client",
 		"block": [
 			{
 				"name": "configuration | client | web",
 				"when": "cfg_authelia_for_owncloud.web != None",
 				"block": [
 					{
 						"name": "emplace",
 						"become": true,
 						"ansible.builtin.template": {
 							"src": "authelia-client-conf-web.json.j2",
 							"dest": "/etc/authelia/conf.d/clients/owncloud-web.json"
 						}
 					}
 				]
 			},
 			{
 				"name": "configuration | client | desktop",
 				"when": "cfg_authelia_for_owncloud.desktop != None",
 				"block": [
 					{
 						"name": "compute client secret hash",
 						"become": true,
 						"ansible.builtin.shell": {
 							"cmd": "authelia crypto hash generate bcrypt --password {{cfg_authelia_for_owncloud.desktop.client_secret}} | cut --delimiter=' ' --fields='2-'"
 						},
 						"register": "temp_authelia_for_owncloud_desktop_client_secret_hashed"
 					},
 					{
 						"name": "emplace",
 						"become": true,
 						"ansible.builtin.template": {
 							"src": "authelia-client-conf-desktop.json.j2",
 							"dest": "/etc/authelia/conf.d/clients/owncloud-desktop.json"
 						}
 					}
 				]
 			},
 			{
 				"name": "configuration | client | android",
 				"when": "cfg_authelia_for_owncloud.android != None",
 				"block": [
 					{
 						"name": "compute client secret hash",
 						"become": true,
 						"ansible.builtin.shell": {
 							"cmd": "authelia crypto hash generate bcrypt --password {{cfg_authelia_for_owncloud.android.client_secret}} | cut --delimiter=' ' --fields='2-'"
 						},
 						"register": "temp_authelia_for_owncloud_android_client_secret_hashed"
 					},
 					{
 						"name": "emplace",
 						"become": true,
 						"ansible.builtin.template": {
 							"src": "authelia-client-conf-android.json.j2",
 							"dest": "/etc/authelia/conf.d/clients/owncloud-android.json"
 						}
 					}
 				]
 			},
 			{
 				"name": "configuration | client | ios",
 				"when": "cfg_authelia_for_owncloud.ios != None",
 				"block": [
 					{
 						"name": "compute client secret hash",
 						"become": true,
 						"ansible.builtin.shell": {
 							"cmd": "authelia crypto hash generate bcrypt --password {{cfg_authelia_for_owncloud.ios.client_secret}} | cut --delimiter=' ' --fields='2-'"
 						},
 						"register": "temp_authelia_for_owncloud_ios_client_secret_hashed"
 					},
 					{
 						"name": "emplace",
 						"become": true,
 						"ansible.builtin.template": {
 							"src": "authelia-client-conf-ios.json.j2",
 							"dest": "/etc/authelia/conf.d/clients/owncloud-ios.json"
 						}
 					}
 				]
 			}
 		]
 	},
 	{
 		"name": "configuration | apply",
 		"become": true,
 		"ansible.builtin.command": {
 			"cmd": "/usr/bin/authelia-conf-compose"
 		}
 	},
 	{
 		"name": "restart service",
 		"become": true,
 		"ansible.builtin.systemd_service": {
 			"state": "restarted",
 			"name": "authelia"
 		}
 	}
 ]
--- a/roles/authelia-for-owncloud/templates/authelia-client-conf-android.json.j2
+++ b/roles/authelia-for-owncloud/templates/authelia-client-conf-android.json.j2
@ -1,33 +0,0 @@
 {
 	"client_id": "{{cfg_authelia_for_owncloud.android.client_id}}",
 	"client_secret": "{{temp_authelia_for_owncloud_android_client_secret_hashed.stdout}}",
 	"client_name": "ownCloud | Android Client",
 	"public": false,
 	"authorization_policy": "one_factor",
 	"require_pkce": true,
 	"pkce_challenge_method": "S256",
 	"scopes": [
 		"openid",
 		"offline_access",
 		"groups",
 		"profile",
 		"email"
 	],
 	"redirect_uris": [
 		"oc://android.owncloud.com"
 	],
 	"response_types": [
 		"code"
 	],
 	"grant_types": [
 		"authorization_code",
 		"refresh_token"
 	],
 	"access_token_signed_response_alg": "none",
 	"userinfo_signed_response_alg": "none",
 	"token_endpoint_auth_method": "client_secret_basic"
 }
--- a/roles/authelia-for-owncloud/templates/authelia-client-conf-desktop.json.j2
+++ b/roles/authelia-for-owncloud/templates/authelia-client-conf-desktop.json.j2
@ -1,33 +0,0 @@
 {
 	"client_id": "{{cfg_authelia_for_owncloud.desktop.client_id}}",
 	"client_secret": "{{temp_authelia_for_owncloud_desktop_client_secret_hashed.stdout}}",
 	"client_name": "ownCloud | Desktop Client",
 	"public": false,
 	"authorization_policy": "one_factor",
 	"require_pkce": true,
 	"pkce_challenge_method": "S256",
 	"scopes": [
 		"openid",
 		"offline_access",
 		"groups",
 		"profile",
 		"email"
 	],
 	"redirect_uris": [
 		"http://127.0.0.1",
 		"http://localhost"
 	],
 	"response_types": [
 		"code"
 	],
 	"grant_types": [
 		"authorization_code",
 		"refresh_token"
 	],
 	"access_token_signed_response_alg": "none",
 	"userinfo_signed_response_alg": "none",
 	"token_endpoint_auth_method": "client_secret_basic"
 }
--- a/roles/authelia-for-owncloud/templates/authelia-client-conf-ios.json.j2
+++ b/roles/authelia-for-owncloud/templates/authelia-client-conf-ios.json.j2
@ -1,33 +0,0 @@
 {
 	"client_id": "{{cfg_authelia_for_owncloud.ios.client_id}}",
 	"client_secret": "{{temp_authelia_for_owncloud_ios_client_secret_hashed.stdout}}",
 	"client_name": "ownCloud | iOS Client",
 	"public": false,
 	"authorization_policy": "one_factor",
 	"require_pkce": true,
 	"pkce_challenge_method": "S256",
 	"scopes": [
 		"openid",
 		"offline_access",
 		"groups",
 		"profile",
 		"email"
 	],
 	"redirect_uris": [
 		"oc://ios.owncloud.com",
 		"oc.ios://ios.owncloud.com"
 	],
 	"response_types": [
 		"code"
 	],
 	"grant_types": [
 		"authorization_code",
 		"refresh_token"
 	],
 	"access_token_signed_response_alg": "none",
 	"userinfo_signed_response_alg": "none",
 	"token_endpoint_auth_method": "client_secret_basic"
 }
--- a/roles/authelia-for-owncloud/templates/authelia-client-conf-web.json.j2
+++ b/roles/authelia-for-owncloud/templates/authelia-client-conf-web.json.j2
@ -1,33 +0,0 @@
 {
 	"client_id": "{{cfg_authelia_for_owncloud.web.client_id}}",
 	"client_name": "ownCloud | Web Client",
 	"lifespan": "long",
 	"public": true,
 	"authorization_policy": "one_factor",
 	"require_pkce": true,
 	"pkce_challenge_method": "S256",
 	"scopes": [
 		"openid",
 		"offline_access",
 		"groups",
 		"profile",
 		"email"
 	],
 	"redirect_uris": [
 		"https://{{cfg_authelia_for_owncloud.owncloud_url_base}}",
 		"https://{{cfg_authelia_for_owncloud.owncloud_url_base}}/oidc-callback.html",
 		"https://{{cfg_authelia_for_owncloud.owncloud_url_base}}/oidc-silent-redirect.html",
 		"https://{{cfg_authelia_for_owncloud.owncloud_url_base}}/apps/openidconnect/redirect"
 	],
 	"response_types": [
 		"code"
 	],
 	"grant_types": [
 		"authorization_code",
 		"refresh_token"
 	],
 	"access_token_signed_response_alg": "none",
 	"userinfo_signed_response_alg": "none",
 	"token_endpoint_auth_method": "none"
 }
--- a/roles/authelia-for-synapse/tasks/main.json
+++ b/roles/authelia-for-synapse/tasks/main.json
@ -1,12 +1,4 @@
 [
 	{
 		"name": "configuration | compute client secret hash",
 		"become": true,
 		"ansible.builtin.shell": {
 			"cmd": "authelia crypto hash generate bcrypt --password {{var_authelia_for_synapse_client_secret}} | cut --delimiter=' ' --fields='2-'"
 		},
 		"register": "temp_authelia_for_synapse_client_secret_hashed"
 	},
 	{
 		"name": "configuration | emplace",
 		"become": true,
--- a/roles/authelia-for-synapse/templates/authelia-client-conf.json.j2
+++ b/roles/authelia-for-synapse/templates/authelia-client-conf.json.j2
@ -1,6 +1,6 @@
 {
 	"client_id": "{{var_authelia_for_synapse_client_id}}",
-	"client_secret": "{{temp_authelia_for_synapse_client_secret_hashed.stdout}}",
+	"client_secret": "{{var_authelia_for_synapse_client_secret}}",
 	"client_name": "Synapse",
 	"public": false,
 	"authorization_policy": "one_factor",
--- a/roles/authelia-for-tandoor/defaults/main.json
+++ b/roles/authelia-for-tandoor/defaults/main.json
@ -1,5 +0,0 @@
 {
 	"var_authelia_for_tandoor_tandoor_url_base": "https://tandoor.example.org",
 	"var_authelia_for_tandoor_client_id": "tandoor",
 	"var_authelia_for_tandoor_client_secret": "REPLACE_ME"
 }
--- a/roles/authelia-for-tandoor/info.md
+++ b/roles/authelia-for-tandoor/info.md
@ -1,8 +0,0 @@
 ## Beschreibung
 Um [Tandoor](../tandoor) gegen [Authelia](../authelia) authentifizieren zu lassen
 ## Verweise
 - [allauth-Dokumentation | Authelia](https://django-allauth.readthedocs.io/en/latest/socialaccount/providers/authelia.html)
--- a/roles/authelia-for-tandoor/tasks/main.json
+++ b/roles/authelia-for-tandoor/tasks/main.json
@ -1,33 +0,0 @@
 [
 	{
 		"name": "configuration | compute client secret hash",
 		"become": true,
 		"ansible.builtin.shell": {
 			"cmd": "authelia crypto hash generate bcrypt --password {{var_authelia_for_tandoor_client_secret}} | cut --delimiter=' ' --fields='2-'"
 		},
 		"register": "temp_authelia_for_tandoor_client_secret_hashed"
 	},
 	{
 		"name": "configuration | emplace",
 		"become": true,
 		"ansible.builtin.template": {
 			"src": "authelia-client-conf.json.j2",
 			"dest": "/etc/authelia/conf.d/clients/tandoor.json"
 		}
 	},
 	{
 		"name": "configuration | apply",
 		"become": true,
 		"ansible.builtin.command": {
 			"cmd": "/usr/bin/authelia-conf-compose"
 		}
 	},
 	{
 		"name": "restart service",
 		"become": true,
 		"ansible.builtin.systemd_service": {
 			"state": "restarted",
 			"name": "authelia"
 		}
 	}
 ]
--- a/roles/authelia-for-tandoor/templates/authelia-client-conf.json.j2
+++ b/roles/authelia-for-tandoor/templates/authelia-client-conf.json.j2
@ -1,17 +0,0 @@
 {
 	"client_id": "{{var_authelia_for_tandoor_client_id}}",
 	"client_secret": "{{temp_authelia_for_tandoor_client_secret_hashed.stdout}}",
 	"client_name": "Tandoor",
 	"public": false,
 	"authorization_policy": "one_factor",
 	"redirect_uris": [
 		"{{var_authelia_for_tandoor_tandoor_url_base}}/accounts/oidc/authelia/login/callback/"
 	],
 	"scopes": [
 		"openid",
 		"email",
 		"profile"
 	],
 	"userinfo_signed_response_alg": "none",
 	"token_endpoint_auth_method": "client_secret_basic"
 }
--- a/roles/authelia-for-vikunja/tasks/main.json
+++ b/roles/authelia-for-vikunja/tasks/main.json
@ -1,12 +1,4 @@
 [
 	{
 		"name": "configuration | compute client secret hash",
 		"become": true,
 		"ansible.builtin.shell": {
 			"cmd": "authelia crypto hash generate bcrypt --password {{var_authelia_for_vikunja_client_secret}} | cut --delimiter=' ' --fields='2-'"
 		},
 		"register": "temp_authelia_for_vikunja_client_secret_hashed"
 	},
 	{
 		"name": "configuration | emplace",
 		"become": true,
--- a/roles/authelia-for-vikunja/templates/authelia-client-conf.json.j2
+++ b/roles/authelia-for-vikunja/templates/authelia-client-conf.json.j2
@ -1,6 +1,6 @@
 {
 	"client_id": "{{var_authelia_for_vikunja_client_id}}",
-	"client_secret": "{{temp_authelia_for_vikunja_client_secret_hashed.stdout}}",
+	"client_secret": "{{var_authelia_for_vikunja_client_secret}}",
 	"client_name": "Vikunja",
 	"public": false,
 	"authorization_policy": "one_factor",
--- a/roles/authelia-for-wiki_js/defaults/main.json
+++ b/roles/authelia-for-wiki_js/defaults/main.json
@ -1,6 +0,0 @@
 {
 	"var_authelia_for_wiki_js_wiki_js_url_base": "https://wiki-js.example.org",
 	"var_authelia_for_wiki_js_client_id": "wiki_js",
 	"var_authelia_for_wiki_js_client_secret": "REPLACE_ME",
 	"var_authelia_for_wiki_js_strategy_id": "authelia"
 }
--- a/roles/authelia-for-wiki_js/info.md
+++ b/roles/authelia-for-wiki_js/info.md
@ -1,9 +0,0 @@
 ## Beschreibung
 Um [Wiki.js](../wiki.js) gegen [Authelia](../authelia) authentifizieren zu lassen
 ## Verweise
 [Wiki.js-Dokumentation | Authentication](https://docs.requarks.io/auth)
 [Authelia-Dokumentation | Wiki.js Integration](https://www.authelia.com/integration/openid-connect/wikijs/)
--- a/roles/authelia-for-wiki_js/templates/authelia-client-conf.json.j2
+++ b/roles/authelia-for-wiki_js/templates/authelia-client-conf.json.j2
@ -1,17 +0,0 @@
 {
 	"client_id": "{{var_authelia_for_wiki_js_client_id}}",
 	"client_secret": "{{temp_authelia_for_wiki_js_client_secret_hashed.stdout}}",
 	"client_name": "Wiki.js",
 	"public": false,
 	"authorization_policy": "one_factor",
 	"redirect_uris": [
 		"{{var_authelia_for_wiki_js_wiki_js_url_base}}/login/{{var_authelia_for_wiki_js_strategy_id}}/callback"
 	],
 	"scopes": [
 		"openid",
 		"email",
 		"profile"
 	],
 	"userinfo_signed_response_alg": "none",
 	"token_endpoint_auth_method": "client_secret_post"
 }
--- a/roles/authelia/cfg.schema.json
+++ b/roles/authelia/cfg.schema.json
@ -1,449 +0,0 @@
 {
 	"nullable": false,
 	"type": "object",
 	"properties": {
 		"listen_address": {
 			"nullable": false,
 			"type": "string",
 			"default": "0.0.0.0"
 		},
 		"domain": {
 			"nullable": false,
 			"type": "string"
 		},
 		"session_domain": {
 			"nullable": false,
 			"type": "string"
 		},
 		"redirect_url": {
 			"nullable": false,
 			"type": "string"
 		},
 		"jwt_secret": {
 			"nullable": false,
 			"type": "string"
 		},
 		"session_secret": {
 			"nullable": false,
 			"type": "string"
 		},
 		"storage_encryption_key": {
 			"nullable": false,
 			"type": "string"
 		},
 		"users_file_path": {
 			"nullable": false,
 			"type": "string",
 			"default": "/var/authelia/users.yml"
 		},
 		"log_file_path": {
 			"nullable": false,
 			"type": "string",
 			"default": "/var/authelia/log.jsonl"
 		},
 		"storage": {
 			"anyOf": [
 				{
 					"nullable": false,
 					"type": "object",
 					"properties": {
 						"kind": {
 							"nullable": false,
 							"type": "string",
 							"enum": ["sqlite"],
 							"default": "sqlite"
 						},
 						"data": {
 							"nullable": false,
 							"type": "object",
 							"properties": {
 								"path": {
 									"nullable": false,
 									"type": "string",
 									"default": "/var/authelia/state.db"
 								}
 							},
 							"additionalProperties": false,
 							"required": [
 								"path"
 							],
 							"default": {
 							}
 						}
 					},
 					"additionalProperties": false,
 					"required": [
 						"kind",
 						"data"
 					],
 					"default": {
 					}
 				},
 				{
 					"nullable": false,
 					"type": "object",
 					"properties": {
 						"kind": {
 							"nullable": false,
 							"type": "string",
 							"enum": ["postgresql"]
 						},
 						"data": {
 							"nullable": false,
 							"type": "object",
 							"properties": {
 								"host": {
 									"nullable": false,
 									"type": "string",
 									"ddefault": "localhost"
 								},
 								"port": {
 									"nullable": false,
 									"type": "integer",
 									"default": 5432
 								},
 								"username": {
 									"nullable": false,
 									"type": "string",
 									"default": "authelia_user"
 								},
 								"password": {
 									"nullable": false,
 									"type": "string"
 								},
 								"schema": {
 									"nullable": false,
 									"type": "string",
 									"default": "authelia"
 								}
 							},
 							"additionalProperties": false,
 							"required": [
 								"host",
 								"port",
 								"username",
 								"password",
 								"schema"
 							],
 							"default": {
 							}
 						}
 					},
 					"additionalProperties": false,
 					"required": [
 						"kind",
 						"data"
 					],
 					"default": {
 					}
 				},
 				{
 					"nullable": false,
 					"type": "object",
 					"properties": {
 						"kind": {
 							"nullable": false,
 							"type": "string",
 							"enum": ["mariadb"]
 						},
 						"data": {
 							"nullable": false,
 							"type": "object",
 							"properties": {
 								"host": {
 									"nullable": false,
 									"type": "string",
 									"ddefault": "localhost"
 								},
 								"port": {
 									"nullable": false,
 									"type": "integer",
 									"default": 3306
 								},
 								"username": {
 									"nullable": false,
 									"type": "string",
 									"default": "authelia_user"
 								},
 								"password": {
 									"nullable": false,
 									"type": "string"
 								},
 								"schema": {
 									"nullable": false,
 									"type": "string",
 									"default": "authelia"
 								}
 							},
 							"additionalProperties": false,
 							"required": [
 								"host",
 								"port",
 								"username",
 								"password",
 								"schema"
 							],
 							"default": {
 							}
 						}
 					},
 					"additionalProperties": false,
 					"required": [
 						"kind",
 						"data"
 					],
 					"default": {
 					}
 				}
 			]
 		},
 		"ntp_server": {
 			"nullable": false,
 			"type": "string",
 			"default": "time.cloudflare.com:123"
 		},
 		"password_reset": {
 			"nullable": false,
 			"type": "object",
 			"properties": {
 				"enabled": {
 					"nullable": false,
 					"type": "boolean",
 					"default": false
 				},
 				"custom_url": {
 					"nullable": true,
 					"type": "string",
 					"default": null
 				}
 			},
 			"additionalProperties": false,
 			"required": [
 				"enabled",
 				"custom_url"
 			],
 			"default": {
 			}
 		},
 		"notification": {
 			"anyOf": [
 				{
 					"nullable": false,
 					"type": "object",
 					"properties": {
 						"kind": {
 							"nullable": false,
 							"type": "string",
 							"enum": ["file"],
 							"default": "file"
 						},
 						"data": {
 							"nullable": false,
 							"type": "object",
 							"properties": {
 								"path": {
 									"nullable": false,
 									"type": "string",
 									"default": "/var/authelia/notifications"
 								}
 							},
 							"additionalProperties": false,
 							"required": [
 								"path"
 							],
 							"default": {
 							}
 						}
 					},
 					"additionalProperties": false,
 					"required": [
 						"kind",
 						"data"
 					],
 					"default": {
 					}
 				},
 				{
 					"nullable": false,
 					"type": "object",
 					"properties": {
 						"kind": {
 							"nullable": false,
 							"type": "string",
 							"enum": ["smtp"],
 							"default": "smtp"
 						},
 						"data": {
 							"nullable": false,
 							"type": "object",
 							"properties": {
 								"host": {
 									"nullable": false,
 									"type": "string"
 								},
 								"port": {
 									"nullable": false,
 									"type": "integer",
 									"default": 465
 								},
 								"username": {
 									"nullable": false,
 									"type": "string",
 									"default": "authelia"
 								},
 								"password": {
 									"nullable": false,
 									"type": "string"
 								},
 								"sender": {
 									"nullable": false,
 									"type": "string",
 									"default": "authelia@example.org"
 								}
 							},
 							"additionalProperties": false,
 							"required": [
 								"host",
 								"port",
 								"username",
 								"password",
 								"sender"
 							]
 						}
 					},
 					"additionalProperties": false,
 					"required": [
 						"kind",
 						"data"
 					],
 					"default": {
 					}
 				}
 			]
 		},
 		"oidc": {
 			"nullable": false,
 			"type": "object",
 			"properties": {
 				"hmac_secret": {
 					"nullable": false,
 					"type": "string"
 				},
 				"lifespan": {
 					"nullable": false,
 					"type": "object",
 					"properties": {
 						"default": {
 							"nullable": false,
 							"type": "object",
 							"properties": {
 								"access_token": {
 									"nullable": false,
 									"type": "string",
 									"default": "1h"
 								},
 								"refresh_token": {
 									"nullable": false,
 									"type": "string",
 									"default": "1m"
 								}
 							},
 							"additionalProperties": false,
 							"required": [
 							],
 							"default": {
 							}
 						},
 						"custom": {
 							"nullable": false,
 							"type": "object",
 							"properties": {
 							},
 							"additionalProperties": {
 								"nullable": false,
 								"type": "object",
 								"properties": {
 									"access_token": {
 										"nullable": false,
 										"type": "string"
 									},
 									"refresh_token": {
 										"nullable": false,
 										"type": "string"
 									}
 								},
 								"additionalProperties": false,
 								"required": [
 									"access_token",
 									"refresh_token"
 								]
 							},
 							"required": [
 							],
 							"default": {
 								"long": {
 									"access_token": "2d",
 									"refresh_token": "3d"
 								}
 							}
 						}
 					},
 					"additionalProperties": false,
 					"required": [
 					],
 					"default": {
 					}
 				},
 				"cors_endpoints": {
 					"nullable": true,
 					"type": "array",
 					"items": {
 						"nullable": false,
 						"type": "string",
 						"enum": [
 							"authorization",
 							"pushed-authorization-request",
 							"token",
 							"revocation",
 							"introspection",
 							"userinfo"
 						]
 					},
 					"default": [
 						"authorization",
 						"token",
 						"revocation",
 						"introspection",
 						"userinfo"
 					]
 				}
 			},
 			"additionalProperties": false,
 			"required": [
 				"hmac_secret",
 				"lifespan",
 				"cors_endpoints"
 			],
 			"default": {
 			}
 		}
 	},
 	"additionalProperties": false,
 	"required": [
 		"listen_address",
 		"domain",
 		"session_domain",
 		"redirect_url",
 		"jwt_secret",
 		"session_secret",
 		"storage_encryption_key",
 		"users_file_path",
 		"log_file_path",
 		"storage",
 		"ntp_server",
 		"notification",
 		"oidc"
 	],
 	"default": {
 	}
 }
--- a/roles/authelia/defaults/main.json
+++ b/roles/authelia/defaults/main.json
@ -1,45 +1,36 @@
 {
-	"cfg_authelia_defaults": {
+	"var_authelia_version": "4.37.5",
-		"listen_address": "0.0.0.0",
+	"var_authelia_architecture": "amd64",
-		"users_file_path": "/var/authelia/users.yml",
+	"var_authelia_listen_address": "0.0.0.0",
-		"log_file_path": "/var/authelia/log.jsonl",
+	"var_authelia_jwt_secret": "REPLACE_ME",
-		"storage": {
+	"var_authelia_users_file_path": "/var/authelia/users.yml",
-			"kind": "sqlite",
+	"var_authelia_log_file_path": "/var/authelia/log.jsonl",
-			"data": {
+	"var_authelia_domain": "authelia.example.org",
-				"path": "/var/authelia/state.db"
+	"var_authelia_redirect_url": "https://example.org",
-			}
+	"var_authelia_session_domain": "example.org",
-		},
+	"var_authelia_session_secret": "REPLACE_ME",
-		"ntp_server": "time.cloudflare.com:123",
+	"var_authelia_storage_encryption_key": "REPLACE_ME",
-		"password_reset": {
+	"var_authelia_storage_kind": "sqlite",
-			"enabled": false,
+	"var_authelia_storage_data_sqlite_path": "/var/authelia/state.db",
-			"custom_url": null
+	"var_authelia_storage_data_postgresql_host": "localhost",
-		},
+	"var_authelia_storage_data_postgresql_port": 5432,
-		"notification": {
+	"var_authelia_storage_data_postgresql_username": "authelia_user",
-			"kind": "file",
+	"var_authelia_storage_data_postgresql_password": "REPLACE_ME",
-			"data": {
+	"var_authelia_storage_data_postgresql_schema": "authelia",
-				"path": "/var/authelia/notifications"
+	"var_authelia_storage_data_mariadb_host": "localhost",
-			}
+	"var_authelia_storage_data_mariadb_port": 3306,
-		},
+	"var_authelia_storage_data_mariadb_username": "authelia_user",
-		"oidc": {
+	"var_authelia_storage_data_mariadb_password": "REPLACE_ME",
-			"lifespan": {
+	"var_authelia_storage_data_mariadb_schema": "authelia",
-				"default": {
+	"var_authelia_ntp_server": "time.cloudflare.com:123",
-					"access_token": "1d",
+	"var_authelia_password_reset_enabled": false,
-					"refresh_token": "1h"
+	"var_authelia_password_reset_custom_url": null,
-				},
+	"var_authelia_notification_mode": "smtp",
-				"custom": {
+	"var_authelia_notification_file_path": "/var/authelia/notifications",
-					"long": {
+	"var_authelia_notification_smtp_host": "smtp.example.org",
-						"access_token": "2d",
+	"var_authelia_notification_smtp_port": 465,
-						"refresh_token": "3d"
+	"var_authelia_notification_smtp_username": "authelia",
-					}
+	"var_authelia_notification_smtp_password": "REPLACE_ME",
-				}
+	"var_authelia_notification_smtp_sender": "authelia@example.org",
-			},
+	"var_authelia_oidc_hmac_secret": "REPLACE_ME"
 			"cors_endpoints": [
 				"authorization",
 				"token",
 				"revocation",
 				"introspection",
 				"userinfo"
 			]
 		}
 	}
 }
--- a/roles/authelia/tasks/main.json
+++ b/roles/authelia/tasks/main.json
@ -1,45 +1,32 @@
 [
 	{
-		"name": "show vars",
+		"name": "packages | prerequisites",
 		"when": "switch_show_vars",
 		"ansible.builtin.debug": {
 			"var": "vars.cfg_authelia"
 		}
 	},
 	{
 		"name": "packages",
 		"block": [
 			{
 				"name": "prerequisites",
 		"become": true,
 		"ansible.builtin.apt": {
 			"update_cache": true,
 			"pkg": [
 				"apt-transport-https",
 						"ca-certificates",
 				"gpg"
 			]
 		}
 	},
 	{
-				"name": "keys",
+		"name": "packages | keys",
 		"become": true,
-				"ansible.builtin.get_url": {
+		"ansible.builtin.apt_key": {
-					"url": "https://www.authelia.com/keys/authelia-security.gpg",
+			"url": "https://apt.authelia.com/organization/signing.asc"
 					"dest": "/usr/share/keyrings/authelia-security.gpg"
 		}
 	},
 	{
-				"name": "repository",
+		"name": "packages | repository",
 		"become": true,
-				"ansible.builtin.shell": {
+		"ansible.builtin.apt_repository": {
-					"cmd": "echo \"deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/authelia-security.gpg] https://apt.authelia.com stable main\" > /etc/apt/sources.list.d/authelia.list",
+			"repo": "deb https://apt.authelia.com/stable/debian/debian/ all main"
 					"creates": "/etc/apt/sources.list.d/authelia.list"
 		}
 	},
 	{
-				"name": "installation",
+		"name": "packages | installation",
 		"become": true,
 		"ansible.builtin.apt": {
 			"update_cache": true,
@ -50,8 +37,6 @@
 				"authelia"
 			]
 		}
 			}
 		]
 	},
 	{
 		"name": "generate private key for signing OIDC JWTs",
@ -64,9 +49,6 @@
 		},
 		"register": "temp_tls_result"
 	},
 	{
 		"name": "configuration",
 		"block": [
 	{
 		"name": "configuration | compose script",
 		"become": true,
@ -102,51 +84,40 @@
 		"ansible.builtin.command": {
 			"cmd": "/usr/bin/authelia-conf-compose --main-file-path=/etc/authelia/conf.d/main.json --clients-directory-path=/etc/authelia/conf.d/clients --output-format=yaml --output-path=/etc/authelia/configuration.yml"
 		}
 			}
 		]
 	},
 	{
 		"name": "setup log directory",
 		"become": true,
 		"ansible.builtin.file": {
 			"state": "directory",
-			"owner": "authelia",
+			"path": "{{var_authelia_log_file_path | dirname}}"
 			"group": "authelia",
 			"path": "{{cfg_authelia.log_file_path | dirname}}"
 		}
 	},
 	{
-		"name": "users",
+		"name": "users | directory",
 		"block": [
 			{
 				"name": "directory",
 		"become": true,
 		"ansible.builtin.file": {
 			"state": "directory",
-					"owner": "authelia",
+			"path": "{{var_authelia_users_file_path | dirname}}"
 					"group": "authelia",
 					"path": "{{cfg_authelia.users_file_path | dirname}}"
 		}
 	},
 	{
-				"name": "initial file",
+		"name": "users | initial file",
 		"become": true,
 		"ansible.builtin.template": {
 			"src": "users.yml.j2",
-					"dest": "{{cfg_authelia.users_file_path}}",
+			"dest": "{{var_authelia_users_file_path}}",
 			"force": false
 		}
 	},
 	{
-				"name": "management script",
+		"name": "users | management script",
 		"become": true,
 		"ansible.builtin.copy": {
 			"src": "user-manage.py",
 			"dest": "/usr/bin/authelia-user-manage",
 			"mode": "0700"
 		}
 			}
 		]
 	},
 	{
 		"name": "apply",
--- a/roles/authelia/templates/conf-main.json.j2
+++ b/roles/authelia/templates/conf-main.json.j2
@ -2,12 +2,12 @@
 	"theme": "auto",
 	"identity_validation": {
 		"reset_password": {
-			"jwt_secret": "{{cfg_authelia.jwt_secret}}"
+			"jwt_secret": "{{var_authelia_jwt_secret}}"
 		}
 	},
 	"default_2fa_method": "totp",
 	"server": {
-		"address": "{{cfg_authelia.listen_address}}:9091",
+		"address": "{{var_authelia_listen_address}}:9091",
 		"endpoints": {
 			"enable_pprof": false,
 			"enable_expvars": false
@ -17,7 +17,7 @@
 	"log": {
 		"level": "info",
 		"format": "json",
-		"file_path": "{{cfg_authelia.log_file_path}}",
+		"file_path": "{{var_authelia_log_file_path}}",
 		"keep_stdout": false
 	},
 	"telemetry": {
@ -43,7 +43,7 @@
 		"user_verification": "preferred"
 	},
 	"ntp": {
-		"address": "{{cfg_authelia.ntp_server}}",
+		"address": "{{var_authelia_ntp_server}}",
 		"version": 4,
 		"max_desync": "3s",
 		"disable_startup_check": false,
@ -51,16 +51,16 @@
 	},
 	"authentication_backend": {
 		"password_reset": {
-{% if cfg_authelia.password_reset.enabled %}
+{% if var_authelia_password_reset_enabled %}
 			"disable": false,
 {% else %}
 			"disable": true,
 {% endif %}
-			"custom_url": {{cfg_authelia.password_reset.custom_url | to_json}}
+			"custom_url": "{{var_authelia_password_reset_custom_url}}"
 		},
 		"refresh_interval": "5m",
 		"file": {
-			"path": "{{cfg_authelia.users_file_path}}",
+			"path": "{{var_authelia_users_file_path}}",
 			"watch": true,
 			"search": {
 				"email": false,
@ -121,15 +121,15 @@
 	"session": {
 		"name": "authelia_session",
 		"same_site": "lax",
-		"secret": "{{cfg_authelia.session_secret}}",
+		"secret": "{{var_authelia_session_secret}}",
 		"expiration": "1h",
 		"inactivity": "5m",
 		"remember_me": "1M",
 		"cookies": [
 			{
-				"domain": "{{cfg_authelia.session_domain}}",
+				"domain": "{{var_authelia_session_domain}}",
-				"authelia_url": "https://{{cfg_authelia.domain}}/",
+				"authelia_url": "https://{{var_authelia_domain}}/",
-				"default_redirection_url": "{{cfg_authelia.redirect_url}}"
+				"default_redirection_url": "{{var_authelia_redirect_url}}"
 			}
 		]
 	},
@ -139,44 +139,45 @@
 		"ban_time": "5m"
 	},
 	"storage": {
-		"encryption_key": "{{cfg_authelia.storage_encryption_key}}",
+		"encryption_key": "{{var_authelia_storage_encryption_key}}",
-{% if cfg_authelia.storage.kind == "sqlite" %}
+{% if var_authelia_storage_kind == "sqlite" %}
 		"local": {
-			"path": "{{cfg_authelia.storage.data.path}}"
+			"path": "{{var_authelia_storage_data_sqlite_path}}"
 		}
 {% endif %}
-{% if cfg_authelia.storage.kind == "postgresql" %}
+{% if var_authelia_storage_kind == "postgresql" %}
 		"postgres": {
-			"address": "{{cfg_authelia.storage.data.host}}:{{cfg_authelia.storage.data.port | string}}",
+			"address": "{{var_authelia_storage_data_postgresql_host}}:{{var_authelia_storage_data_postgresql_port | string}}",
 			"schema": "public",
-			"username": "{{cfg_authelia.storage.data.username}}",
+			"username": "{{var_authelia_storage_data_postgresql_username}}",
-			"password": "{{cfg_authelia.storage.data.password}}",
+			"password": "{{var_authelia_storage_data_postgresql_password}}",
-			"database": "{{cfg_authelia.storage.data.schema}}"
+			"database": "{{var_authelia_storage_data_postgresql_schema}}"
 		}
 {% endif %}
-{% if cfg_authelia.storage.kind == "mariadb" %}
+{% if var_authelia_storage_kind == "mariadb" %}
 		"mysql": {
-			"host": "{{cfg_authelia.storage.data.host}}",
+			"host": "{{var_authelia_storage_data_mariadb_host}}",
-			"port": {{cfg_authelia.storage.data.port | string}},
+			"port": {{var_authelia_storage_data_mariadb_port | string}},
-			"username": "{{cfg_authelia.storage.data.username}}",
+			"username": "{{var_authelia_storage_data_mariadb_username}}",
-			"password": "{{cfg_authelia.storage.data.password}}",
+			"password": "{{var_authelia_storage_data_mariadb_password}}",
-			"database": "{{cfg_authelia.storage.data.schema}}"
+			"database": "{{var_authelia_storage_data_mariadb_schema}}"
 		}
 {% endif %}
 	},
 	"notifier": {
 		"disable_startup_check": true,
-{% if cfg_authelia.notification.kind == "file" %}
+{% if var_authelia_notification_mode == "file" %}
 		"filesystem": {
-			"filename": "{{cfg_authelia.notification.data.path}}"
+			"filename": "{{var_authelia_notification_file_path}}"
 		}
 {% endif %}
-{% if cfg_authelia.notification.kind == "smtp" %}
+{% if var_authelia_notification_mode == "smtp" %}
 		"smtp": {
-			"address": "{{cfg_authelia.notification.data.host}}:{{cfg_authelia.notification.data.port | string}}",
+			"host": "{{var_authelia_notification_smtp_host}}",
-			"username": "{{cfg_authelia.notification.data.username}}",
+			"port": {{var_authelia_notification_smtp_port | string}},
-			"password": "{{cfg_authelia.notification.data.password}}",
+			"username": "{{var_authelia_notification_smtp_username}}",
-			"sender": "{{cfg_authelia.notification.data.sender}}",
+			"password": "{{var_authelia_notification_smtp_password}}",
 			"sender": "{{var_authelia_notification_smtp_sender}}",
 			"disable_require_tls": false,
 			"disable_html_emails": false,
 			"tls": {
@ -187,24 +188,10 @@
 	},
 	"identity_providers": {
 		"oidc": {
-			"hmac_secret": "{{cfg_authelia.oidc.hmac_secret}}",
+			"hmac_secret": "{{var_authelia_oidc_hmac_secret}}",
-			"jwks": [
+			"issuer_private_key": "{{temp_tls_result.privatekey | replace('\n', '\\n')}}",
 				{
 					"algorithm": "RS256",
 					"key": "{{temp_tls_result.privatekey | replace('\n', '\\n')}}"
 				}
 			],
 			"lifespans": {
 				"access_token": "{{cfg_authelia.oidc.lifespan.default.access_token}}",
 				"refresh_token": "{{cfg_authelia.oidc.lifespan.default.refresh_token}}",
 				"custom": {{cfg_authelia.oidc.lifespan.custom | to_json}}
 			},
 			"cors": {
 				"allowed_origins_from_client_redirect_uris": true
 {% if cfg_authelia.oidc.cors_endpoints == None %}
 {% else %}
 				,"endpoints": {{cfg_authelia.oidc.cors_endpoints | to_json}}
 {% endif %}
 			},
 			"clients": [
 			]
--- a/roles/authelia/vardef.json
+++ b/roles/authelia/vardef.json
@ -0,0 +1,143 @@
 {
 	"version": {
 		"type": "string",
 		"mandatory": false
 	},
 	"architecture": {
 		"type": "string",
 		"mandatory": false
 	},
 	"listen_address": {
 		"type": "string",
 		"mandatory": false
 	},
 	"jwt_secret": {
 		"type": "string",
 		"mandatory": true
 	},
 	"users_file_path": {
 		"type": "string",
 		"mandatory": false
 	},
 	"log_file_path": {
 		"type": "string",
 		"mandatory": false
 	},
 	"domain": {
 		"type": "string",
 		"mandatory": false
 	},
 	"redirect_url": {
 		"type": "string",
 		"mandatory": false
 	},
 	"session_domain": {
 		"type": "string",
 		"mandatory": false
 	},
 	"session_secret": {
 		"type": "string",
 		"mandatory": true
 	},
 	"storage_encryption_key": {
 		"type": "string",
 		"mandatory": true
 	},
 	"storage_kind": {
 		"type": "string",
 		"mandatory": false
 	},
 	"storage_data_sqlite_path": {
 		"type": "string",
 		"mandatory": false
 	},
 	"storage_data_postgresql_host": {
 		"type": "string",
 		"mandatory": false
 	},
 	"storage_data_postgresql_port": {
 		"type": "integer",
 		"mandatory": false
 	},
 	"storage_data_postgresql_username": {
 		"type": "string",
 		"mandatory": false
 	},
 	"storage_data_postgresql_password": {
 		"type": "string",
 		"mandatory": false
 	},
 	"storage_data_postgresql_schema": {
 		"type": "string",
 		"mandatory": false
 	},
 	"storage_data_mariadb_host": {
 		"type": "string",
 		"mandatory": false
 	},
 	"storage_data_mariadb_port": {
 		"type": "integer",
 		"mandatory": false
 	},
 	"storage_data_mariadb_username": {
 		"type": "string",
 		"mandatory": false
 	},
 	"storage_data_mariadb_password": {
 		"type": "string",
 		"mandatory": false
 	},
 	"storage_data_mariadb_schema": {
 		"type": "string",
 		"mandatory": false
 	},
 	"ntp_server": {
 		"type": "string",
 		"mandatory": false
 	},
 	"password_reset_enabled": {
 		"type": "boolean",
 		"mandatory": false
 	},
 	"password_reset_custom_url": {
 		"nullable": true,
 		"type": "string",
 		"mandatory": false
 	},
 	"notification_mode": {
 		"type": "string",
 		"mandatory": false,
 		"options": [
 			"file",
 			"smtp"
 		]
 	},
 	"notification_file_path": {
 		"type": "string",
 		"mandatory": false
 	},
 	"notification_smtp_host": {
 		"type": "string",
 		"mandatory": false
 	},
 	"notification_smtp_port": {
 		"type": "integer",
 		"mandatory": false
 	},
 	"notification_smtp_username": {
 		"type": "string",
 		"mandatory": false
 	},
 	"notification_smtp_password": {
 		"type": "string",
 		"mandatory": false
 	},
 	"notification_smtp_sender": {
 		"type": "string",
 		"mandatory": false
 	},
 	"oidc_hmac_secret": {
 		"type": "string",
 		"mandatory": true
 	}
 }
--- 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": "force"
+	"var_dokuwiki_and_nginx_tls_mode": "enable"
 }
--- 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": "force"
+	"var_element_and_nginx_tls_mode": "enable"
 }
--- a/roles/forgejo-and-nginx/defaults/main.json
+++ b/roles/forgejo-and-nginx/defaults/main.json
@ -1,5 +0,0 @@
 {
 	"var_forgejo_and_nginx_domain": "forgejo.example.org",
 	"var_forgejo_and_nginx_port": 2378,
 	"var_forgejo_and_nginx_tls_mode": "force"
 }
--- a/roles/forgejo-and-nginx/info.md
+++ b/roles/forgejo-and-nginx/info.md
@ -1 +0,0 @@
--- a/roles/forgejo-and-nginx/templates/conf.j2
+++ b/roles/forgejo-and-nginx/templates/conf.j2
@ -1,34 +0,0 @@
 {% macro forgejo_common() %}
 	location / {
 		proxy_pass http://localhost:{{var_forgejo_and_nginx_port | string}};
 		client_max_body_size 20M;
 	}
 {% endmacro %}
 server {
 	listen 80;
 	listen [::]:80;
 	server_name {{var_forgejo_and_nginx_domain}};
 {% if var_forgejo_and_nginx_tls_mode == 'force' %}
 	return 301 https://$http_host$request_uri;
 {% else %}
 {{ forgejo_common() }}
 {% endif %}
 }
 {% if var_forgejo_and_nginx_tls_mode != 'disable' %}
 server {
 	listen 443 ssl;
 	listen [::]:443 ssl;
 	server_name {{var_forgejo_and_nginx_domain}};
 	ssl_certificate_key /etc/ssl/private/{{var_forgejo_and_nginx_domain}}.pem;
 	ssl_certificate /etc/ssl/fullchains/{{var_forgejo_and_nginx_domain}}.pem;
 	include /etc/nginx/ssl-hardening.conf;
 {{ forgejo_common() }}
 }
 {% endif %}
--- a/roles/forgejo/defaults/main.json
+++ b/roles/forgejo/defaults/main.json
@ -1,31 +0,0 @@
 {
 	"var_forgejo_user": "forgejo",
 	"var_forgejo_directory_main": "/opt/forgejo",
 	"var_forgejo_directory_repositories": "/var/forgejo/repositories",
 	"var_forgejo_version": "10.0.3",
 	"var_forgejo_platform": "linux-amd64",
 	"var_forgejo_secret_key": "REPLACE_ME",
 	"var_forgejo_internal_token": "REPLACE_ME",
 	"var_forgejo_domain": "forgejo.example.org",
 	"var_forgejo_listen_address": "0.0.0.0",
 	"var_forgejo_listen_port": 2378,
 	"var_forgejo_database_kind": "sqlite",
 	"var_forgejo_database_data_sqlite_path": "/var/forgejo/data.sqlite",
 	"var_forgejo_database_data_postgresql_host": "postgresql.example.org",
 	"var_forgejo_database_data_postgresql_port": 5432,
 	"var_forgejo_database_data_postgresql_username": "forgejo_user",
 	"var_forgejo_database_data_postgresql_password": "REPLACE_ME",
 	"var_forgejo_database_data_postgresql_scheme": "forgejo",
 	"var_forgejo_authentication_kind": "internal",
 	"var_forgejo_authentication_data_authelia_url_base": "https://authelia.example.org",
 	"var_forgejo_authentication_data_authelia_client_id": "forgejo",
 	"var_forgejo_authentication_data_authelia_client_secret": "REPLACE_ME",
 	"var_forgejo_smtp_host": "smtp.example.org",
 	"var_forgejo_smtp_port": 465,
 	"var_forgejo_smtp_username": "REPLACE_ME",
 	"var_forgejo_smtp_password": "REPLACE_ME",
 	"var_forgejo_email_sending_enabled": false,
 	"var_forgejo_email_sending_sender": "forgejo@example.org",
 	"var_forgejo_email_sending_html": false,
 	"var_forgejo_title": "Forgejo: Beyond coding. We Forge."
 }
--- a/roles/forgejo/info.md
+++ b/roles/forgejo/info.md
@ -1,14 +0,0 @@
 ## Beschreibung
 Zur Einrichtung der DevOps-Platform [Forgejo](https://forgejo.org/)
 ## Verweise
 - [Forgejo | Documentation | Administrator Guide](https://forgejo.org/docs/latest/admin/)
 - [Forgejo | Documentation | Configuration Cheat Sheet](https://forgejo.org/docs/latest/admin/config-cheat-sheet/)
 ## ToDo
 - Download verfizieren
--- a/roles/forgejo/tasks/main.json
+++ b/roles/forgejo/tasks/main.json
@ -1,101 +0,0 @@
 [
 	{
 		"name": "packages",
 		"become": true,
 		"ansible.builtin.apt": {
 			"update_cache": true,
 			"pkg": [
 				"git"
 			]
 		}
 	},
 	{
 		"name": "user",
 		"become": true,
 		"ansible.builtin.user": {
 			"name": "{{var_forgejo_user}}",
 			"create_home": true,
 			"home": "{{var_forgejo_directory_main}}"
 		}
 	},
 	{
 		"name": "directories | external",
 		"become": true,
 		"loop": [
 			"{{var_forgejo_database_data_sqlite_path | dirname}}",
 			"{{var_forgejo_directory_repositories}}"
 		],
 		"ansible.builtin.file": {
 			"path": "{{item}}",
 			"state": "directory",
 			"owner": "{{var_forgejo_user}}"
 		}
 	},
 	{
 		"name": "directories | internal",
 		"become": true,
 		"become_user": "{{var_forgejo_user}}",
 		"loop": [
 			"{{var_forgejo_directory_main}}/custom/conf"
 		],
 		"ansible.builtin.file": {
 			"path": "{{item}}",
 			"state": "directory"
 		}
 	},
 	{
 		"name": "download",
 		"become": true,
 		"become_user": "{{var_forgejo_user}}",
 		"ansible.builtin.get_url": {
 			"url": "https://codeberg.org/forgejo/forgejo/releases/download/v{{var_forgejo_version}}/forgejo-{{var_forgejo_version}}-{{var_forgejo_platform}}",
 			"dest": "{{var_forgejo_directory_main}}/forgejo",
 			"mode": "u+rx"
 		}
 	},
 	{
 		"name": "config | base",
 		"become": true,
 		"become_user": "{{var_forgejo_user}}",
 		"ansible.builtin.template": {
 			"src": "config.ini.j2",
 			"dest": "{{var_forgejo_directory_main}}/custom/conf/app.ini"
 		}
 	},
 	{
 		"name": "config | database",
 		"become": true,
 		"become_user": "{{var_forgejo_user}}",
 		"ansible.builtin.command": {
 			"chdir": "{{var_forgejo_directory_main}}",
 			"cmd": "./forgejo migrate"
 		}
 	},
 	{
 		"name": "config | authelia",
 		"when": "var_forgejo_authentication_kind == 'authelia'",
 		"become": true,
 		"become_user": "{{var_forgejo_user}}",
 		"ansible.builtin.shell": {
 			"chdir": "{{var_forgejo_directory_main}}",
 			"cmd": "(./forgejo admin auth list | grep authelia) || ./forgejo admin auth add-oauth --provider='openidConnect' --name='authelia' --key={{var_forgejo_authentication_data_authelia_client_id}} --secret={{var_forgejo_authentication_data_authelia_client_secret}} --auto-discover-url='{{var_forgejo_authentication_data_authelia_url_base}}/.well-known/openid-configuration' --scopes='openid email profile'"
 		}
 	},
 	{
 		"name": "systemd unit",
 		"become": true,
 		"ansible.builtin.template": {
 			"src": "systemd-unit.j2",
 			"dest": "/etc/systemd/system/forgejo.service"
 		}
 	},
 	{
 		"name": "start",
 		"become": true,
 		"ansible.builtin.systemd_service": {
 			"enabled": true,
 			"state": "restarted",
 			"name": "forgejo"
 		}
 	}
 ]
--- a/roles/forgejo/templates/systemd-unit.j2
+++ b/roles/forgejo/templates/systemd-unit.j2
@ -1,21 +0,0 @@
 [Unit]
 Description=Forgejo
 After=network.target
 {% if var_forgejo_database_kind == 'postgresql' %}
 Wants=postgresql.service
 After=postgresql.service
 {% endif %}
 [Service]
 RestartSec=2s
 Type=simple
 User={{var_forgejo_user}}
 Group={{var_forgejo_user}}
 WorkingDirectory={{var_forgejo_directory_main}}
 ExecStart={{var_forgejo_directory_main}}/forgejo web --config {{var_forgejo_directory_main}}/custom/conf/app.ini
 Restart=always
 # Environment=USER=git HOME=/home/git FORGEJO_WORK_DIR=/var/lib/forgejo
 # Environment=PATH=/path/to/git/bin:/bin:/sbin:/usr/bin:/usr/sbin
 [Install]
 WantedBy=multi-user.target
--- a/roles/gitea-and-nginx/defaults/main.json
+++ b/roles/gitea-and-nginx/defaults/main.json
@ -0,0 +1,5 @@
 {
 	"var_gitea_and_nginx_domain": "gitea.example.org",
 	"var_gitea_and_nginx_port": 2378,
 	"var_gitea_and_nginx_tls_mode": "enable"
 }
--- a/roles/gitea-and-nginx/info.md
+++ b/roles/gitea-and-nginx/info.md
@ -0,0 +1,3 @@
 ## Verweise
 - [Gitea-Dokumentation](https://docs.gitea.com/next/administration/reverse-proxies#nginx)
--- a/roles/forgejo-and-nginx/tasks/main.json
+++ b/roles/forgejo-and-nginx/tasks/main.json
@ -12,7 +12,7 @@
 		"become": true,
 		"ansible.builtin.template": {
 			"src": "conf.j2",
-			"dest": "/etc/nginx/sites-available/{{var_forgejo_and_nginx_domain}}"
+			"dest": "/etc/nginx/sites-available/{{var_gitea_and_nginx_domain}}"
 		}
 	},
 	{
@ -20,8 +20,8 @@
 		"become": true,
 		"ansible.builtin.file": {
 			"state": "link",
-			"src": "/etc/nginx/sites-available/{{var_forgejo_and_nginx_domain}}",
+			"src": "/etc/nginx/sites-available/{{var_gitea_and_nginx_domain}}",
-			"dest": "/etc/nginx/sites-enabled/{{var_forgejo_and_nginx_domain}}"
+			"dest": "/etc/nginx/sites-enabled/{{var_gitea_and_nginx_domain}}"
 		}
 	},
 	{
--- a/roles/gitea-and-nginx/templates/conf.j2
+++ b/roles/gitea-and-nginx/templates/conf.j2
@ -0,0 +1,34 @@
 {% macro gitea_common() %}
 	location / {
 		proxy_pass http://localhost:{{var_gitea_and_nginx_port | string}};
 		client_max_body_size 20M;
 	}
 {% endmacro %}
 server {
 	listen 80;
 	listen [::]:80;
 	server_name {{var_gitea_and_nginx_domain}};
 {% if var_gitea_and_nginx_tls_mode == 'force' %}
 	return 301 https://$http_host$request_uri;
 {% else %}
 {{ gitea_common() }}
 {% endif %}
 }
 {% if var_gitea_and_nginx_tls_mode != 'disable' %}
 server {
 	listen 443 ssl;
 	listen [::]:443 ssl;
 	server_name {{var_gitea_and_nginx_domain}};
 	ssl_certificate_key /etc/ssl/private/{{var_gitea_and_nginx_domain}}.pem;
 	ssl_certificate /etc/ssl/fullchains/{{var_gitea_and_nginx_domain}}.pem;
 	include /etc/nginx/ssl-hardening.conf;
 {{ gitea_common() }}
 }
 {% endif %}
--- a/roles/forgejo-and-nginx/vardef.json
+++ b/roles/forgejo-and-nginx/vardef.json
--- a/roles/gitea/defaults/main.json
+++ b/roles/gitea/defaults/main.json
@ -0,0 +1,29 @@
 {
 	"var_gitea_user": "gitea",
 	"var_gitea_directory": "/opt/gitea",
 	"var_gitea_version": "1.22.1",
 	"var_gitea_platform": "linux-amd64",
 	"var_gitea_secret_key": "REPLACE_ME",
 	"var_gitea_internal_token": "REPLACE_ME",
 	"var_gitea_domain": "gitea.example.org",
 	"var_gitea_listen_address": "0.0.0.0",
 	"var_gitea_listen_port": 2378,
 	"var_gitea_database_kind": "sqlite",
 	"var_gitea_database_data_sqlite_path": "/var/gitea/data.sqlite",
 	"var_gitea_database_data_postgresql_host": "postgresql.example.org",
 	"var_gitea_database_data_postgresql_port": 5432,
 	"var_gitea_database_data_postgresql_username": "gitea_user",
 	"var_gitea_database_data_postgresql_password": "REPLACE_ME",
 	"var_gitea_database_data_postgresql_scheme": "gitea",
 	"var_gitea_authentication_kind": "internal",
 	"var_gitea_authentication_data_authelia_url_base": "https://authelia.example.org",
 	"var_gitea_authentication_data_authelia_client_id": "gitea",
 	"var_gitea_authentication_data_authelia_client_secret": "REPLACE_ME",
 	"var_gitea_smtp_host": "smtp.example.org",
 	"var_gitea_smtp_port": 465,
 	"var_gitea_smtp_username": "REPLACE_ME",
 	"var_gitea_smtp_password": "REPLACE_ME",
 	"var_gitea_email_sending_enabled": false,
 	"var_gitea_email_sending_sender": "gitea@example.org",
 	"var_gitea_email_sending_html": false
 }
--- a/roles/gitea/info.md
+++ b/roles/gitea/info.md
@ -0,0 +1,10 @@
 ## Beschreibung
 Zur Einrichtung der DevOps-Platform [Gitea](https://about.gitea.com/)
 ## Verweise
 - [Gitea Homepage | self hosting](https://about.gitea.com/products/gitea/)
 - [Gitea Documentation | Installation from binary](https://docs.gitea.com/installation/install-from-binary)
 - [Gitea Documentation | Config Cheat Sheet](https://docs.gitea.com/administration/config-cheat-sheet)
--- a/roles/gitea/tasks/main.json
+++ b/roles/gitea/tasks/main.json
@ -0,0 +1,99 @@
 [
 	{
 		"name": "packages",
 		"become": true,
 		"ansible.builtin.apt": {
 			"update_cache": true,
 			"pkg": [
 				"git"
 			]
 		}
 	},
 	{
 		"name": "user",
 		"become": true,
 		"ansible.builtin.user": {
 			"name": "{{var_gitea_user}}",
 			"create_home": true,
 			"home": "{{var_gitea_directory}}"
 		}
 	},
 	{
 		"name": "directories | database",
 		"become": true,
 		"loop": [
 			"{{var_gitea_database_data_sqlite_path | dirname}}"
 		],
 		"ansible.builtin.file": {
 			"path": "{{item}}",
 			"state": "directory"
 		}
 	},
 	{
 		"name": "directories | internal",
 		"become": true,
 		"become_user": "{{var_gitea_user}}",
 		"loop": [
 			"{{var_gitea_directory}}/custom/conf"
 		],
 		"ansible.builtin.file": {
 			"path": "{{item}}",
 			"state": "directory"
 		}
 	},
 	{
 		"name": "download",
 		"become": true,
 		"become_user": "{{var_gitea_user}}",
 		"ansible.builtin.get_url": {
 			"url": "https://dl.gitea.com/gitea/{{var_gitea_version}}/gitea-{{var_gitea_version}}-{{var_gitea_platform}}",
 			"dest": "{{var_gitea_directory}}/gitea",
 			"mode": "u+rx"
 		}
 	},
 	{
 		"name": "config | base",
 		"become": true,
 		"become_user": "{{var_gitea_user}}",
 		"ansible.builtin.template": {
 			"src": "config.ini.j2",
 			"dest": "{{var_gitea_directory}}/custom/conf/app.ini"
 		}
 	},
 	{
 		"name": "config | database",
 		"become": true,
 		"become_user": "{{var_gitea_user}}",
 		"ansible.builtin.command": {
 			"chdir": "{{var_gitea_directory}}",
 			"cmd": "./gitea migrate"
 		}
 	},
 	{
 		"name": "config | authelia",
 		"when": "var_gitea_authentication_kind == 'authelia'",
 		"become": true,
 		"become_user": "{{var_gitea_user}}",
 		"ansible.builtin.command": {
 			"chdir": "{{var_gitea_directory}}",
 			"cmd": "./gitea admin auth add-oauth --provider='openidConnect' --name='authelia' --key={{var_gitea_authentication_data_authelia_client_id}} --secret={{var_gitea_authentication_data_authelia_client_secret}} --auto-discover-url='{{var_gitea_authentication_data_authelia_url_base}}/.well-known/openid-configuration' --scopes='openid email profile'"
 		}
 	},
 	{
 		"name": "systemd unit",
 		"become": true,
 		"ansible.builtin.template": {
 			"src": "systemd-unit.j2",
 			"dest": "/etc/systemd/system/gitea.service"
 		}
 	},
 	{
 		"name": "start",
 		"become": true,
 		"ansible.builtin.systemd_service": {
 			"enabled": true,
 			"state": "restarted",
 			"name": "gitea"
 		}
 	}
 ]
--- a/roles/forgejo/templates/config.ini.j2
+++ b/roles/forgejo/templates/config.ini.j2
@ -1,31 +1,31 @@
-APP_NAME = {{var_forgejo_title}}
+APP_NAME = Gitea: Git with a cup of tea
-RUN_USER = {{var_forgejo_user}}
+RUN_USER = {{var_gitea_user}}
 RUN_MODE = prod
 [server]
-DOMAIN = {{var_forgejo_domain}}
+DOMAIN = {{var_gitea_domain}}
-ROOT_URL = https://{{var_forgejo_domain}}
+ROOT_URL = https://{{var_gitea_domain}}
-;HTTP_ADDR = {{var_forgejo_listen_address}}
+;HTTP_ADDR = {{var_gitea_listen_address}}
-HTTP_PORT = {{var_forgejo_listen_port | string}}
+HTTP_PORT = {{var_gitea_listen_port | string}}
 ;LANDING_PAGE = home
 [database]
-{% if var_forgejo_database_kind == 'sqlite' %}
+{% if var_gitea_database_kind == 'sqlite' %}
 DB_TYPE = sqlite3
-PATH = {{var_forgejo_database_data_sqlite_path}}
+PATH = {{var_gitea_database_data_sqlite_path}}
 {% endif %}
-{% if var_forgejo_database_kind == 'postgresql' %}
+{% if var_gitea_database_kind == 'postgresql' %}
 DB_TYPE = postgres
-HOST = {{var_forgejo_database_data_postgresql_host}}:{{var_forgejo_database_data_postgresql_port | string}}
+HOST = {{var_gitea_database_data_postgresql_host}}:{{var_gitea_database_data_postgresql_port | string}}
-USER = {{var_forgejo_database_data_postgresql_username}}
+USER = {{var_gitea_database_data_postgresql_username}}
-PASSWD = {{var_forgejo_database_data_postgresql_password}}
+PASSWD = {{var_gitea_database_data_postgresql_password}}
-NAME = {{var_forgejo_database_data_postgresql_scheme}}
+NAME = {{var_gitea_database_data_postgresql_scheme}}
 {% endif %}
 [security]
 INSTALL_LOCK = true
-SECRET_KEY = {{var_forgejo_secret_key}}
+SECRET_KEY = {{var_gitea_secret_key}}
-INTERNAL_TOKEN = {{var_forgejo_internal_token}}
+INTERNAL_TOKEN = {{var_gitea_internal_token}}
 DISABLE_GIT_HOOKS = true
 [oauth2]
@ -36,12 +36,12 @@ MODE = console
 LEVEL = Info
 [git]
-HOME_PATH = {{var_forgejo_directory_main}}
+HOME_PATH = {{var_gitea_directory}}
 [service]
 REGISTER_EMAIL_CONFIRM = false
-{% if var_forgejo_authentication_kind == 'internal' %}
+{% if var_gitea_authentication_kind == 'internal' %}
 DISABLE_REGISTRATION = false
 ALLOW_ONLY_INTERNAL_REGISTRATION = true
 ALLOW_ONLY_EXTERNAL_REGISTRATION = false
@ -76,7 +76,7 @@ ENABLE_USER_HEATMAP = false
 ENABLE_TIMETRACKING = false
 DEFAULT_ENABLE_TIMETRACKING = false
-{% if var_forgejo_authentication_kind == 'internal' %}
+{% if var_gitea_authentication_kind == 'internal' %}
 SHOW_REGISTRATION_BUTTON = true
 {% else %}
 SHOW_REGISTRATION_BUTTON = false
@ -85,10 +85,7 @@ SHOW_REGISTRATION_BUTTON = false
 AUTO_WATCH_NEW_REPOS = false
 AUTO_WATCH_ON_CHANGES = false
-[repository]
+{% if var_gitea_authentication_kind == 'internal' %}
 ROOT = {{var_forgejo_directory_repositories}}
 {% if var_forgejo_authentication_kind == 'internal' %}
 [openid]
 ENABLE_OPENID_SIGNIN = false
 ENABLE_OPENID_SIGNUP = false
@ -96,7 +93,7 @@ ENABLE_OPENID_SIGNUP = false
 [openid]
 ENABLE_OPENID_SIGNIN = false
 ENABLE_OPENID_SIGNUP = true
-WHITELISTED_URIS = {{var_forgejo_authentication_data_authelia_url_base}}
+WHITELISTED_URIS = {{var_gitea_authentication_data_authelia_url_base}}
 [oauth2_client]
 REGISTER_EMAIL_CONFIRM = false
@ -106,14 +103,14 @@ USERNAME = nickname
 {% endif %}
 [mailer]
-{% if var_forgejo_email_sending_enabled %}
+{% if var_gitea_email_sending_enabled %}
 ENABLED = true
-SMTP_ADDR = {{var_forgejo_smtp_host}}
+SMTP_ADDR = {{var_gitea_smtp_host}}
-SMTP_PORT = {{var_forgejo_smtp_port | string}}
+SMTP_PORT = {{var_gitea_smtp_port | string}}
-FROM = {{var_forgejo_email_sending_sender}}
+FROM = {{var_gitea_email_sending_sender}}
-USER = {{var_forgejo_smtp_username}}
+USER = {{var_gitea_smtp_username}}
-PASSWD = {{var_forgejo_smtp_password}}
+PASSWD = {{var_gitea_smtp_password}}
-{% if var_forgejo_email_sending_html %}
+{% if var_gitea_email_sending_html %}
 SEND_AS_PLAIN_TEXT = false
 {% else %}
 SEND_AS_PLAIN_TEXT = true
--- a/roles/gitea/templates/systemd-unit.j2
+++ b/roles/gitea/templates/systemd-unit.j2
@ -0,0 +1,21 @@
 [Unit]
 Description=Gitea (Git with a cup of tea)
 After=network.target
 {% if var_gitea_database_kind == 'postgresql' %}
 Wants=postgresql.service
 After=postgresql.service
 {% endif %}
 [Service]
 RestartSec=2s
 Type=simple
 User={{var_gitea_user}}
 Group={{var_gitea_user}}
 WorkingDirectory={{var_gitea_directory}}
 ExecStart={{var_gitea_directory}}/gitea web --config {{var_gitea_directory}}/custom/conf/app.ini
 Restart=always
 # Environment=USER=git HOME=/home/git GITEA_WORK_DIR=/var/lib/gitea
 # Environment=PATH=/path/to/git/bin:/bin:/sbin:/usr/bin:/usr/sbin
 [Install]
 WantedBy=multi-user.target
--- a/roles/forgejo/vardef.json
+++ b/roles/forgejo/vardef.json
@ -3,11 +3,7 @@
 		"type": "string",
 		"mandatory": false
 	},
-	"directory_main": {
+	"directory": {
 		"type": "string",
 		"mandatory": false
 	},
 	"directory_repositories": {
 		"type": "string",
 		"mandatory": false
 	},
@ -118,9 +114,5 @@
 	"email_sending_html": {
 		"mandatory": false,
 		"type": "boolean"
 	},
 	"title": {
 		"mandatory": false,
 		"type": "string"
 	}
 }
--- 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": "force"
+	"var_gitlab_and_nginx_tls_mode": "enable"
 }
--- a/roles/hedgedoc-and-nginx/cfg.schema.json
+++ b/roles/hedgedoc-and-nginx/cfg.schema.json
@ -1,24 +0,0 @@
 {
 	"nullable": false,
 	"type": "object",
 	"properties": {
 		"domain": {
 			"nullable": false,
 			"type": "string"
 		},
 		"tls_mode": {
 			"nullable": false,
 			"type": "string",
 			"options": [
 				"disable",
 				"enable",
 				"force"
 			],
 			"default": "force"
 		}
 	},
 	"additionalProperties": false,
 	"required": [
 		"domain"
 	]
 }
--- a/roles/hedgedoc-and-nginx/defaults/main.json
+++ b/roles/hedgedoc-and-nginx/defaults/main.json
@ -1,5 +1,4 @@
 {
-	"cfg_hedgedoc_and_nginx_defaults": {
+	"var_hedgedoc_and_nginx_domain": "hedgedoc.example.org",
-		"tls_mode": "force"
+	"var_hedgedoc_and_nginx_tls_mode": "enable"
 	}
 }
--- a/roles/hedgedoc-and-nginx/tasks/main.json
+++ b/roles/hedgedoc-and-nginx/tasks/main.json
@ -1,11 +1,4 @@
 [
 	{
 		"name": "show vars",
 		"when": "switch_show_vars",
 		"ansible.builtin.debug": {
 			"var": "vars.cfg_hedgedoc_and_nginx"
 		}
 	},
 	{
 		"name": "deactivate default site",
 		"become": true,
@ -19,7 +12,7 @@
 		"become": true,
 		"ansible.builtin.template": {
 			"src": "conf.j2",
-			"dest": "/etc/nginx/sites-available/{{cfg_hedgedoc_and_nginx.domain}}"
+			"dest": "/etc/nginx/sites-available/{{var_hedgedoc_and_nginx_domain}}"
 		}
 	},
 	{
@ -27,8 +20,8 @@
 		"become": true,
 		"ansible.builtin.file": {
 			"state": "link",
-			"src": "/etc/nginx/sites-available/{{cfg_hedgedoc_and_nginx.domain}}",
+			"src": "/etc/nginx/sites-available/{{var_hedgedoc_and_nginx_domain}}",
-			"dest": "/etc/nginx/sites-enabled/{{cfg_hedgedoc_and_nginx.domain}}"
+			"dest": "/etc/nginx/sites-enabled/{{var_hedgedoc_and_nginx_domain}}"
 		}
 	},
 	{
--- a/roles/hedgedoc-and-nginx/templates/conf.j2
+++ b/roles/hedgedoc-and-nginx/templates/conf.j2
@ -24,29 +24,28 @@ map $http_upgrade $connection_upgrade {
 {% endmacro %}
 server {
-	server_name {{cfg_hedgedoc_and_nginx.domain}};
+	server_name {{var_hedgedoc_and_nginx_domain}};
 	listen 80;
 	listen [::]:80;
-{% if (cfg_hedgedoc_and_nginx.tls_mode == 'force') %}
+{% if (var_element_and_nginx_tls_mode == 'force') %}
 	return 301 https://$http_host$request_uri;
 {% else %}
 {{ hedgedoc_common() }}
 {% endif %}
 }
-{% if (cfg_hedgedoc_and_nginx.tls_mode != 'disable') %}
+{% if (var_hedgedoc_and_nginx_tls_mode != 'disable') %}
 server {
-	server_name {{cfg_hedgedoc_and_nginx.domain}};
+	server_name {{var_hedgedoc_and_nginx_domain}};
 	listen [::]:443 ssl http2;
 	listen 443 ssl http2;
-	ssl_certificate_key /etc/ssl/private/{{cfg_hedgedoc_and_nginx.domain}}.pem;
+	ssl_certificate_key /etc/ssl/private/{{var_hedgedoc_and_nginx_domain}}.pem;
-	ssl_certificate /etc/ssl/fullchains/{{cfg_hedgedoc_and_nginx.domain}}.pem;
+	ssl_certificate /etc/ssl/fullchains/{{var_hedgedoc_and_nginx_domain}}.pem;
 	include /etc/nginx/ssl-hardening.conf;
 {{ hedgedoc_common() }}
 }
 {% endif %}
--- a/roles/hedgedoc-and-nginx/vardef.json
+++ b/roles/hedgedoc-and-nginx/vardef.json
@ -0,0 +1,15 @@
 {
 	"domain": {
 		"type": "string",
 		"mandatory": false
 	},
 	"tls_mode": {
        "type": "string",
        "options": [
 			"disable",
 			"enable",
 			"force"
        ],
        "mandatory": false
 	}
 }
--- a/roles/hedgedoc/cfg.schema.json
+++ b/roles/hedgedoc/cfg.schema.json
@ -1,248 +0,0 @@
 {
 	"nullable": false,
 	"type": "object",
 	"properties": {
 		"user_name": {
 			"nullable": false,
 			"type": "string",
 			"default": "hedgedoc"
 		},
 		"directory": {
 			"nullable": false,
 			"type": "string",
 			"default": "/opt/hedgedoc"
 		},
 		"version": {
 			"nullable": false,
 			"type": "string",
 			"default": "1.10.3"
 		},
 		"domain": {
 			"nullable": false,
 			"type": "string"
 		},
 		"session_secret": {
 			"nullable": false,
 			"type": "string"
 		},
 		"database": {
 			"anyOf": [
 				{
 					"nullable": false,
 					"type": "object",
 					"properties": {
 						"kind": {
 							"nullable": false,
 							"type": "string",
 							"enum": ["sqlite"],
 							"default": "sqlite"
 						},
 						"data": {
 							"nullable": false,
 							"type": "object",
 							"properties": {
 								"path": {
 									"nullable": false,
 									"type": "string",
 									"default": "/var/hedgedoc/data.sqlite"
 								}
 							},
 							"additionalProperties": false,
 							"required": [
 								"path"
 							],
 							"default": {
 							}
 						}
 					},
 					"additionalProperties": false,
 					"required": [
 						"kind",
 						"data"
 					]
 				},
 				{
 					"nullable": false,
 					"type": "object",
 					"properties": {
 						"kind": {
 							"nullable": false,
 							"type": "string",
 							"enum": ["postgresql"],
 							"default": "postgresql"
 						},
 						"data": {
 							"nullable": false,
 							"type": "object",
 							"properties": {
 								"host": {
 									"nullable": false,
 									"type": "string",
 									"default": "localhost"
 								},
 								"port": {
 									"nullable": false,
 									"type": "integer",
 									"default": 5432
 								},
 								"username": {
 									"nullable": false,
 									"type": "string",
 									"default": "hedgedoc_user"
 								},
 								"password": {
 									"nullable": false,
 									"type": "string"
 								},
 								"schema": {
 									"nullable": false,
 									"type": "string",
 									"default": "hedgedoc"
 								}
 							},
 							"additionalProperties": false,
 							"required": [
 								"host",
 								"port",
 								"username",
 								"password",
 								"schema"
 							]
 						}
 					},
 					"additionalProperties": false,
 					"required": [
 						"kind",
 						"data"
 					]
 				}
 			]
 		},
 		"authentication": {
 			"anyOf": [
 				{
 					"nullable": false,
 					"type": "object",
 					"properties": {
 						"kind": {
 							"nullable": false,
 							"type": "string",
 							"enum": ["internal"],
 							"default": "internal"
 						},
 						"data": {
 							"nullable": false,
 							"type": "object",
 							"properties": {
 							},
 							"additionalProperties": false,
 							"required": [
 							],
 							"default": {
 							}
 						}
 					},
 					"additionalProperties": false,
 					"required": [
 						"kind",
 						"data"
 					]
 				},
 				{
 					"nullable": false,
 					"type": "object",
 					"properties": {
 						"kind": {
 							"nullable": false,
 							"type": "string",
 							"enum": ["authelia"],
 							"default": "authelia"
 						},
 						"data": {
 							"nullable": false,
 							"type": "object",
 							"properties": {
 								"url_base": {
 									"nullable": false,
 									"type": "string"
 								},
 								"client_id": {
 									"nullable": false,
 									"type": "string",
 									"default": "hedgedoc"
 								},
 								"client_secret": {
 									"nullable": false,
 									"type": "string"
 								},
 								"provider_name": {
 									"nullable": false,
 									"type": "string",
 									"default": "Authelia"
 								}
 							},
 							"additionalProperties": false,
 							"required": [
 								"url_base",
 								"client_id",
 								"client_secret",
 								"provider_name"
 							]	
 						}
 					},
 					"additionalProperties": false,
 					"required": [
 						"kind",
 						"data"
 					]
 				}
 			]
 		},
 		"guest_allow_create": {
 			"nullable": false,
 			"type": "boolean",
 			"default": false
 		},
 		"guest_allow_change": {
 			"nullable": false,
 			"type": "boolean",
 			"default": false
 		},
 		"free_names_mode": {
 			"nullable": false,
 			"type": "string",
 			"enum": [
 				"never",
 				"authed",
 				"always"
 			],
 			"default": "authed"
 		},
 		"log_level": {
 			"nullable": false,
 			"type": "string",
 			"enum": [
 				"debug",
 				"verbose",
 				"info",
 				"warn",
 				"error"
 			],
 			"default": "error"
 		}
 	},
 	"additionalProperties": false,
 	"required": [
 		"user_name",
 		"directory",
 		"version",
 		"domain",
 		"session_secret",
 		"database",
 		"authentication",
 		"guest_allow_create",
 		"guest_allow_change",
 		"free_names_mode",
 		"log_level"
 	]
 }
--- a/roles/hedgedoc/defaults/main.json
+++ b/roles/hedgedoc/defaults/main.json
@ -1,22 +1,21 @@
 {
-	"cfg_hedgedoc_defaults": {
+	"var_hedgedoc_user_name": "hedgedoc",
-		"user_name": "hedgedoc",
+	"var_hedgedoc_directory": "/opt/hedgedoc",
-		"directory": "/opt/hedgedoc",
+	"var_hedgedoc_version": "1.9.9",
-		"version": "1.10.3",
+	"var_hedgedoc_session_secret": "REPLACE_ME",
-		"database": {
+	"var_hedgedoc_database_kind": "sqlite",
-			"kind": "sqlite",
+	"var_hedgedoc_database_data_sqlite_path": "/var/hedgedoc/data.sqlite",
-			"data": {
+	"var_hedgedoc_database_data_postgresql_host": "localhost",
-				"path": "/var/hedgedoc/data.sqlite"
+	"var_hedgedoc_database_data_postgresql_port": 5432,
-			}
+	"var_hedgedoc_database_data_postgresql_username": "hedgedoc_user",
-		},
+	"var_hedgedoc_database_data_postgresql_password": "REPLACE_ME",
-		"authentication": {
+	"var_hedgedoc_database_data_postgresql_schema": "hedgedoc",
-			"kind": "internal",
+	"var_hedgedoc_domain": "hedgedoc.example.org",
-			"data": {
+	"var_hedgedoc_authentication_kind": "authelia",
-			}
+	"var_hedgedoc_authentication_data_authelia_client_id": "hedgedoc",
-		},
+	"var_hedgedoc_authentication_data_authelia_client_secret": "REPLACE_ME",
-		"guest_allow_create": false,
+	"var_hedgedoc_authentication_data_authelia_url_base": "https://authelia.example.org",
-		"guest_allow_change": false,
+	"var_hedgedoc_guest_allow_create": false,
-		"free_names_mode": "authed",
+	"var_hedgedoc_guest_allow_change": false,
-		"log_level": "error"
+	"var_hedgedoc_free_names_mode": "authed"
 	}
 }
--- a/roles/hedgedoc/tasks/main.json
+++ b/roles/hedgedoc/tasks/main.json
@ -1,11 +1,4 @@
 [
 	{
 		"name": "show vars",
 		"when": "switch_show_vars",
 		"ansible.builtin.debug": {
 			"var": "vars.cfg_hedgedoc"
 		}
 	},
 	{
 		"name": "packages",
 		"become": true,
@ -33,41 +26,15 @@
 		"name": "user",
 		"become": true,
 		"ansible.builtin.user": {
-			"name": "{{cfg_hedgedoc.user_name}}",
+			"name": "{{var_hedgedoc_user_name}}",
-			"create_home": true,
+			"create_home": true
 			"home": "{{cfg_hedgedoc.directory}}"
 		}
 	},
 	{
 		"name": "database",
 		"when": "cfg_hedgedoc.database.kind == 'sqlite'",
 		"block": [
 			{
 				"name": "database | directory",
 				"become": true,
 				"ansible.builtin.file": {
 					"state": "directory",
 					"path": "{{cfg_hedgedoc.database.data.sqlite.path | dirname}}",
 					"owner": "{{cfg_hedgedoc.user_name}}"
 				}
 			},
 			{
 				"name": "database | file",
 				"become": true,
 				"ansible.builtin.file": {
 					"state": "touch",
 					"path": "{{cfg_hedgedoc.database.data.sqlite.path}}",
 					"owner": "{{cfg_hedgedoc.user_name}}"
 				}
 			}
 		]
 	},
 	{
 		"name": "download",
 		"become": false,
 		"ansible.builtin.get_url": {
-			"url": "https://github.com/hedgedoc/hedgedoc/releases/download/{{cfg_hedgedoc.version}}/hedgedoc-{{cfg_hedgedoc.version}}.tar.gz",
+			"url": "https://github.com/hedgedoc/hedgedoc/releases/download/{{var_hedgedoc_version}}/hedgedoc-{{var_hedgedoc_version}}.tar.gz",
 			"dest": "/tmp/hedgedoc.tar.gz"
 		}
 	},
@ -77,8 +44,8 @@
 		"ansible.builtin.unarchive": {
 			"remote_src": true,
 			"src": "/tmp/hedgedoc.tar.gz",
-			"dest": "{{cfg_hedgedoc.directory | dirname}}",
+			"dest": "{{var_hedgedoc_directory | dirname}}",
-			"owner": "{{cfg_hedgedoc.user_name}}"
+			"owner": "{{var_hedgedoc_user_name}}"
 		}
 	},
 	{
@ -86,7 +53,7 @@
 		"become": true,
 		"become_user": "hedgedoc",
 		"ansible.builtin.command": {
-			"chdir": "{{cfg_hedgedoc.directory}}",
+			"chdir": "{{var_hedgedoc_directory}}",
 			"cmd": "bin/setup"
 		}
 	},
@ -95,7 +62,7 @@
 		"become": true,
 		"ansible.builtin.template": {
 			"src": "config.json.j2",
-			"dest": "{{cfg_hedgedoc.directory}}/config.json"
+			"dest": "{{var_hedgedoc_directory}}/config.json"
 		}
 	},
 	{
--- a/roles/hedgedoc/templates/config.json.j2
+++ b/roles/hedgedoc/templates/config.json.j2
@ -1,61 +1,61 @@
 {
 	"production": {
-		"loglevel": "{{cfg_hedgedoc.log_level}}",
+		"loglevel": "error",
-{% if cfg_hedgedoc.database.kind == 'sqlite' %}
+{% if var_hedgedoc_database_kind == 'sqlite' %}
 		"db": {
 			"dialect": "sqlite",
-			"storage": "{{cfg_hedgedoc.database.data.sqlite.path}}"
+			"storage": "{{var_hedgedoc_database_data_sqlite_path}}"
 		},
 {% endif %}
-{% if cfg_hedgedoc.database.kind == 'postgresql' %}
+{% if var_hedgedoc_database_kind == 'postgresql' %}
 		"db": {
 			"dialect": "postgres",
-			"host": "{{cfg_hedgedoc.database.data.postgresql.host}}",
+			"host": "{{var_hedgedoc_database_data_postgresql_host}}",
-			"port": {{cfg_hedgedoc.database.data.postgresql.port | to_json}},
+			"port": {{var_hedgedoc_database_data_postgresql_port | to_json}},
-			"username": "{{cfg_hedgedoc.database.data.postgresql.username}}",
+			"username": "{{var_hedgedoc_database_data_postgresql_username}}",
-			"password": "{{cfg_hedgedoc.database.data.postgresql.password}}",
+			"password": "{{var_hedgedoc_database_data_postgresql_password}}",
-			"database": "{{cfg_hedgedoc.database.data.postgresql.schema}}"
+			"database": "{{var_hedgedoc_database_data_postgresql_schema}}"
 		},
 {% endif %}
-		"sessionSecret": "{{cfg_hedgedoc.session_secret}}",
+		"sessionSecret": "{{var_hedgedoc_session_secret}}",
 		"host": "localhost",
 		"allowOrigin": [
 			"localhost"
 		],
-		"domain": "{{cfg_hedgedoc.domain}}",
+		"domain": "{{var_hedgedoc_domain}}",
 		"urlAddPort": false,
 		"protocolUseSSL": true,
-{% if cfg_hedgedoc.authentication.kind == 'internal' %}
+{% if var_hedgedoc_authentication_kind == 'internal' %}
 		"email": true,
 		"allowEmailRegister": true,
 {% endif %}
-{% if cfg_hedgedoc.authentication.kind == 'authelia' %}
+{% if var_hedgedoc_authentication_kind == 'authelia' %}
 		"oauth2": {
-			"providerName": "{{cfg_hedgedoc.authentication.data.authelia.provider_name}}",
+			"providerName": "{{var_hedgedoc_authentication_data_authelia_provider_name}}",
-			"clientID": "{{cfg_hedgedoc.authentication.data.authelia.client_id}}",
+			"clientID": "{{var_hedgedoc_authentication_data_authelia_client_id}}",
-			"clientSecret": "{{cfg_hedgedoc.authentication.data.authelia.client_secret}}",
+			"clientSecret": "{{var_hedgedoc_authentication_data_authelia_client_secret}}",
 			"scope": "openid email profile",
 			"userProfileUsernameAttr": "sub",
 			"userProfileDisplayNameAttr": "name",
 			"userProfileEmailAttr": "email",
-			"userProfileURL": "{{cfg_hedgedoc.authentication.data.authelia.url_base}}/api/oidc/userinfo",
+			"userProfileURL": "{{var_hedgedoc_authentication_data_authelia_url_base}}/api/oidc/userinfo",
-			"tokenURL": "{{cfg_hedgedoc.authentication.data.authelia.url_base}}/api/oidc/token",
+			"tokenURL": "{{var_hedgedoc_authentication_data_authelia_url_base}}/api/oidc/token",
-			"authorizationURL": "{{cfg_hedgedoc.authentication.data.authelia.url_base}}/api/oidc/authorization"
+			"authorizationURL": "{{var_hedgedoc_authentication_data_authelia_url_base}}/api/oidc/authorize"
 		},
 		"email": false,
 		"allowEmailRegister": false,
 {% endif %}
-		"allowAnonymous": {{cfg_hedgedoc.guest_allow_create | to_json}},
+		"allowAnonymous": {{var_hedgedoc_guest_allow_create | to_json}},
-		"allowAnonymousEdits": {{cfg_hedgedoc.guest_allow_change | to_json}},
+		"allowAnonymousEdits": {{var_hedgedoc_guest_allow_change | to_json}},
-{% if cfg_hedgedoc.free_names_mode == 'never' %}
+{% if var_hedgedoc_free_names_mode == 'never' %}
 		"allowFreeURL": false,
 		"requireFreeURLAuthentication": false,
 {% endif %}
-{% if cfg_hedgedoc.free_names_mode == 'authed' %}
+{% if var_hedgedoc_free_names_mode == 'authed' %}
 		"allowFreeURL": true,
 		"requireFreeURLAuthentication": true,
 {% endif %}
-{% if cfg_hedgedoc.free_names_mode == 'always' %}
+{% if var_hedgedoc_free_names_mode == 'always' %}
 		"allowFreeURL": true,
 		"requireFreeURLAuthentication": false,
 {% endif %}
--- a/roles/hedgedoc/templates/systemd-unit.j2
+++ b/roles/hedgedoc/templates/systemd-unit.j2
@ -3,8 +3,8 @@ Description=Hedgedoc
 After=multi-user.target
 [Service]
-WorkingDirectory={{cfg_hedgedoc.directory}}
+WorkingDirectory={{var_hedgedoc_directory}}
-User={{cfg_hedgedoc.user_name}}
+User={{var_hedgedoc_user_name}}
 Environment="NODE_ENV=production"
 ExecStart=yarn start
 SyslogIdentifier=hedgedoc
--- a/roles/hedgedoc/vardef.json
+++ b/roles/hedgedoc/vardef.json
@ -0,0 +1,87 @@
 {
 	"user_name": {
 		"type": "string",
 		"mandatory": false
 	},
 	"directory": {
 		"type": "string",
 		"mandatory": false
 	},
 	"version": {
 		"type": "string",
 		"mandatory": false
 	},
 	"session_secret": {
 		"type": "string",
 		"mandatory": true
 	},
 	"database_kind": {
 		"type": "string",
 		"mandatory": false,
 		"options": [
 			"sqlite",
 			"postgresql",
 			"mariadb"
 		]
 	},
 	"database_data_sqlite_path": {
 		"type": "string",
 		"mandatory": false
 	},
 	"database_data_postgresql_host": {
 		"type": "string",
 		"mandatory": false
 	},
 	"database_data_postgresql_port": {
 		"type": "integer",
 		"mandatory": false
 	},
 	"database_data_postgresql_username": {
 		"type": "string",
 		"mandatory": false
 	},
 	"database_data_postgresql_password": {
 		"type": "string",
 		"mandatory": false
 	},
 	"database_data_postgresql_schema": {
 		"type": "string",
 		"mandatory": false
 	},
 	"domain": {
 		"type": "string",
 		"mandatory": false
 	},
 	"authentication_kind": {
 		"type": "string",
 		"mandatory": false,
 		"options": [
 			"internal",
 			"authelia"
 		]
 	},
 	"authentication_data_authelia_client_id": {
 		"type": "string",
 		"mandatory": false
 	},
 	"authentication_data_authelia_client_secret": {
 		"type": "string",
 		"mandatory": false
 	},
 	"authentication_data_authelia_url_base": {
 		"type": "string",
 		"mandatory": false
 	},
 	"guest_allow_create": {
 		"type": "boolean",
 		"mandatory": false
 	},
 	"guest_allow_change": {
 		"type": "boolean",
 		"mandatory": false
 	},
 	"free_names_mode": {
 		"type": "string",
 		"mandatory": false
 	}
 }
--- a/roles/murmur/tasks/main.json
+++ b/roles/murmur/tasks/main.json
@ -15,7 +15,7 @@
 		"become": true,
 		"ansible.builtin.file": {
 			"state": "directory",
-			"path": "/var/murmurd"
+			"path": "/var/murmur"
 		}
 	},
 	{
@ -23,10 +23,11 @@
 		"when": "var_murmur_tls",
 		"become": true,
 		"loop": [
-			{"from": "/etc/ssl/private/{{var_murmur_domain}}.pem", "to": "/var/murmurd/tls-key.pem"},
+			{"from": "/etc/ssl/private/{{var_murmur_domain}}.pem", "to": "/var/murmur/tls-key.pem"},
-			{"from": "/etc/ssl/fullchains/{{var_murmur_domain}}.pem", "to": "/var/murmurd/tls-fullchain.pem"}
+			{"from": "/etc/ssl/fullchains/{{var_murmur_domain}}.pem", "to": "/var/murmur/tls-fullchain.pem"}
 		],
 		"ansible.builtin.copy": {
 			"state": "directory",
 			"remote_src": true,
 			"src": "{{item.from}}",
 			"dest": "{{item.to}}",
--- a/roles/nginx/cfg.schema.json
+++ b/roles/nginx/cfg.schema.json
@ -1,28 +0,0 @@
 {
 	"nullable": false,
 	"type": "object",
 	"properties": {
 		"auto_reload_interval": {
 			"nullable": true,
 			"type": "integer",
 			"description": "in hours",
 			"default": null
 		},
 		"dhparam_size": {
 			"nullable": true,
 			"type": "integer",
 			"default": null
 		},
 		"improved_security": {
 			"nullable": false,
 			"type": "boolean",
 			"default": false
 		}
 	},
 	"additionalProperties": false,
 	"required": [
 		"auto_reload_interval",
 		"dhparam_size",
 		"improved_security"
 	]
 }
--- a/roles/nginx/defaults/main.json
+++ b/roles/nginx/defaults/main.json
@ -1,7 +1,3 @@
 {
-	"cfg_nginx_defaults": {
+	"var_nginx_auto_reload_interval": null
 		"auto_reload_interval": null,
 		"dhparam_size": null,
 		"improved_security": false
 	}
 }
--- a/roles/nginx/templates/ssl-hardening.conf.j2
+++ b/roles/nginx/templates/ssl-hardening.conf.j2
@ -3,9 +3,7 @@ ssl_session_cache shared:MozSSL:10m;  # about 40000 sessions
 ssl_session_tickets off;
 # curl https://ssl-config.mozilla.org/ffdhe2048.txt > /path/to/dhparam
 {% if cfg_nginx.dhparam_size != None %}
 ssl_dhparam /etc/nginx/dhparam;
 {% endif %}
 # intermediate configuration
 ssl_protocols TLSv1.2 TLSv1.3;
--- a/roles/nginx/tasks/main.json
+++ b/roles/nginx/tasks/main.json
@ -1,11 +1,4 @@
 [
 	{
 		"name": "show vars",
 		"when": "switch_show_vars",
 		"ansible.builtin.debug": {
 			"var": "vars.cfg_nginx"
 		}
 	},
 	{
 		"name": "install packages",
 		"become": true,
@ -19,10 +12,9 @@
 	},
 	{
 		"name": "generate dhparams file",
 		"when": "cfg_nginx.dhparam_size != None",
 		"become": true,
 		"ansible.builtin.command": {
-			"cmd": "openssl dhparam -out /etc/nginx/dhparam {{cfg_nginx.dhparam_size | string}}"
+			"cmd": "openssl dhparam -out /etc/nginx/dhparam 4096"
 		},
 		"args": {
 			"creates": "/etc/nginx/dhparam"
@ -31,16 +23,13 @@
 	{
 		"name": "place hardening config",
 		"become": true,
-		"ansible.builtin.template": {
+		"ansible.builtin.copy": {
-			"src": "ssl-hardening.conf.j2",
+			"src": "ssl-hardening.conf",
 			"dest": "/etc/nginx/ssl-hardening.conf"
 		}
 	},
 	{
-		"name": "ufw",
+		"name": "ufw | check",
 		"block": [
 			{
 				"name": "check",
 		"become": true,
 		"check_mode": true,
 		"community.general.ufw": {
@ -49,7 +38,7 @@
 		"register": "ufw_enable_check"
 	},
 	{
-				"name": "allow port 80",
+		"name": "ufw | allow port 80",
 		"when": "not ufw_enable_check.changed",
 		"become": true,
 		"community.general.ufw": {
@ -59,7 +48,7 @@
 		}
 	},
 	{
-				"name": "allow port 443",
+		"name": "ufw | allow port 443",
 		"when": "not ufw_enable_check.changed",
 		"become": true,
 		"community.general.ufw": {
@ -67,18 +56,16 @@
 			"port": "443",
 			"proto": "tcp"
 		}
 			}
 		]
 	},
 	{
 		"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": "*",
@ -87,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": "*",
--- a/roles/nginx/vardef.json
+++ b/roles/nginx/vardef.json
@ -0,0 +1,8 @@
 {
 	"auto_reload_interval": {
 		"description": "in hours",
 		"nullable": true,
 		"type": "integer",
 		"mandatory": false
 	}
 }
--- a/roles/owncloud-and-nginx/cfg.schema.json
+++ b/roles/owncloud-and-nginx/cfg.schema.json
@ -1,31 +0,0 @@
 {
 	"nullable": false,
 	"type": "object",
 	"properties": {
 		"domain": {
 			"nullable": false,
 			"type": "string"
 		},
 		"tls_mode": {
 			"nullable": false,
 			"type": "string",
 			"enum": [
 				"disable",
 				"enable",
 				"force"
 			],
 			"default": "force"
 		},
 		"maximum_upload_size": {
 			"nullable": false,
 			"type": "string",
 			"default": "1G"
 		}
 	},
 	"additionalProperties": false,
 	"required": [
 		"domain",
 		"tls_mode",
 		"maximum_upload_size"
 	]
 }
--- a/roles/owncloud-and-nginx/defaults/main.json
+++ b/roles/owncloud-and-nginx/defaults/main.json
@ -1,6 +0,0 @@
 {
 	"cfg_owncloud_and_nginx_defaults": {
 		"tls_mode": "force",
 		"maximum_upload_size": "1G"
 	}
 }
--- a/roles/owncloud-and-nginx/tasks/main.json
+++ b/roles/owncloud-and-nginx/tasks/main.json
@ -1,42 +0,0 @@
 [
 	{
 		"name": "show vars",
 		"when": "switch_show_vars",
 		"ansible.builtin.debug": {
 			"var": "vars.cfg_owncloud_and_nginx"
 		}
 	},
 	{
 		"name": "deactivate default site",
 		"become": true,
 		"ansible.builtin.file": {
 			"state": "absent",
 			"dest": "/etc/nginx/sites-enabled/default"
 		}
 	},
 	{
 		"name": "emplace configuration | data",
 		"become": true,
 		"ansible.builtin.template": {
 			"src": "conf.j2",
 			"dest": "/etc/nginx/sites-available/{{cfg_owncloud_and_nginx.domain}}"
 		}
 	},
 	{
 		"name": "emplace configuration | link",
 		"become": true,
 		"ansible.builtin.file": {
 			"state": "link",
 			"src": "/etc/nginx/sites-available/{{cfg_owncloud_and_nginx.domain}}",
 			"dest": "/etc/nginx/sites-enabled/{{cfg_owncloud_and_nginx.domain}}"
 		}
 	},
 	{
 		"name": "restart nginx",
 		"become": true,
 		"ansible.builtin.systemd_service": {
 			"state": "restarted",
 			"name": "nginx"
 		}
 	}
 ]
--- a/roles/owncloud-and-nginx/templates/conf.j2
+++ b/roles/owncloud-and-nginx/templates/conf.j2
@ -1,34 +0,0 @@
 {% macro owncloud_common() %}
 	location / {
 		proxy_pass http://localhost:9200;
 		client_max_body_size {{cfg_owncloud_and_nginx.maximum_upload_size}};
 	}
 {% endmacro %}
 server {
 	listen 80;
 	listen [::]:80;
 	server_name {{cfg_owncloud_and_nginx.domain}};
 {% if cfg_owncloud_and_nginx.tls_mode == 'force' %}
 	return 301 https://$http_host$request_uri;
 {% else %}
 	{{ owncloud_common() }}
 {% endif %}
 }
 {% if cfg_owncloud_and_nginx.tls_mode != 'disable' %}
 server {
 	listen 443 ssl;
 	listen [::]:443 ssl;
 	server_name {{cfg_owncloud_and_nginx.domain}};
 	ssl_certificate_key /etc/ssl/private/{{cfg_owncloud_and_nginx.domain}}.pem;
 	ssl_certificate /etc/ssl/fullchains/{{cfg_owncloud_and_nginx.domain}}.pem;
 	include /etc/nginx/ssl-hardening.conf;
 	{{ owncloud_common() }}
 }
 {% endif %}
--- a/roles/owncloud/cfg.schema.json
+++ b/roles/owncloud/cfg.schema.json
@ -1,152 +0,0 @@
 {
 	"nullable": false,
 	"type": "object",
 	"properties": {
 		"user": {
 			"nullable": false,
 			"type": "string",
 			"default": "owncloud"
 		},
 		"directory": {
 			"nullable": false,
 			"type": "string",
 			"default": "/opt/owncloud"
 		},
 		"version": {
 			"nullable": false,
 			"type": "string",
 			"default": "7.2.0"
 		},
 		"platform": {
 			"nullable": false,
 			"type": "string",
 			"default": "linux-amd64"
 		},
 		"domain": {
 			"nullable": false,
 			"type": "string"
 		},
 		"admin_password": {
 			"nullable": false,
 			"type": "string"
 		},
 		"authentication": {
 			"anyOf": [
 				{
 					"nullable": false,
 					"type": "object",
 					"properties": {
 						"kind": {
 							"type": "string",
 							"enum": ["internal"],
 							"default": "internal"
 						},
 						"data": {
 							"nullable": false,
 							"type": "object",
 							"properties": {
 							},
 							"additionalProperties": false,
 							"required": [
 							],
 							"default": {
 							}
 						}
 					},
 					"additionalProperties": false,
 					"required": [
 						"kind",
 						"data"
 					]
 				},
 				{
 					"nullable": false,
 					"type": "object",
 					"properties": {
 						"kind": {
 							"type": "string",
 							"enum": ["authelia"],
 							"default": "authelia"
 						},
 						"data": {
 							"nullable": false,
 							"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": [
 										"client_id"
 									],
 									"default": {
 									}
 								}
 							},
 							"additionalProperties": false,
 							"required": [
 								"url_base",
 								"web"
 							]
 						}
 					},
 					"additionalProperties": false,
 					"required": [
 						"kind",
 						"data"
 					]
 				}
 			]
 		},
 		"public_share": {
 			"nullable": false,
 			"type": "object",
 			"properties": {
 				"password_necessity": {
 					"nullable": false,
 					"type": "string",
 					"enum": [
 						"nothing",
 						"writable",
 						"all"
 					],
 					"default": "writable"
 				},
 				"password_policy_active": {
 					"nullable": false,
 					"type": "boolean",
 					"default": true
 				}
 			},
 			"additionalProperties": false,
 			"required": [
 				"password_necessity",
 				"password_policy_active"
 			],
 			"default": {
 			}
 		}
 	},
 	"additionalProperties": false,
 	"required": [
 		"user",
 		"directory",
 		"version",
 		"platform",
 		"domain",
 		"admin_password",
 		"authentication",
 		"public_share"
 	]
 }
--- a/roles/owncloud/defaults/main.json
+++ b/roles/owncloud/defaults/main.json
@ -1,16 +0,0 @@
 {
 	"cfg_owncloud_defaults": {
 		"user": "owncloud",
 		"directory": "/opt/owncloud",
 		"version": "7.2.0",
 		"platform": "linux-amd64",
 		"domain": "owncloud.example.org",
 		"authentication": {
 			"kind": "internal"
 		},
 		"public_share": {
 			"password_necessity": "writable",
 			"password_policy_active": true
 		}
 	}
 }
--- a/roles/owncloud/info.md
+++ b/roles/owncloud/info.md
@ -1,32 +0,0 @@
 ## Beschreibung
 Cloud-Plattform [ownCloud](https://owncloud.com/) (the rewrite in Go named "Infinite Scale")
 ## Verweise
 - [ownCloud-Dokumentation | How to install ownCloud Infinite Scale Tech Preview in three easy steps](https://owncloud.com/news/howto-install-owncloud-infinite-scale-tech-preview/)
 - [ownCloud-Dokumentation | oCIS](https://owncloud.dev/ocis/)
 - [ownCloud-Dokumentation | Upgrading](https://doc.owncloud.com/ocis/next/migration/upgrading-ocis.html)
 - [ownCloud-Dokumentation | env var types](https://doc.owncloud.com/ocis/next/deployment/services/envvar-types-description.html)
 - [ownCloud-Dokumentation | Service | Web](https://doc.owncloud.com/ocis/next/deployment/services/s-list/web.html)
 - [ownCloud-Dokumentation | Service | Proxy](https://doc.owncloud.com/ocis/next/deployment/services/s-list/proxy.html)
 - [ownCloud-Dokumentation | Service | Sharing](https://doc.owncloud.com/ocis/next/deployment/services/s-list/sharing.html)
 - [GitHub | ocis](https://github.com/owncloud/ocis/)
 - [ownCloud-Foren | OCIS + Authelia](https://central.owncloud.org/t/ocis-authelia/44222)
 ## Bemerkungen
 - die `.ocis/config/ocis.yaml` wird erzeugt auf Grundlage der `.env`
 - `.ocis/config/ocis.yaml` sollte niemals einfach neu erstellt werden, da man sich sonst nicht mehr einloggen kann
 - wenn man sich plötzlich nicht mehr über OIDC anmelden kann, kann das daran lieget, dass `.ocis/idm/ldap.crt` abgelaufen ist — siehe dazu [diesen Thread](https://central.owncloud.org/t/certificate-error-after-upgrade-to-5-0-0-from-4-0-6/47824/7); man könnte auch `OCIS_LDAP_INSECURE` auf `true` setzen, aber naja…
 ## ToDo
 - Download prüfen
 - `csp.yaml` einsetzen
 - prüfen ob folgende `.env`-Variablen gebraucht werden:
  - `PROXY_OIDC_ISSUER`
  - `PROXY_OIDC_SKIP_USER_INFO`
--- a/roles/owncloud/tasks/main.json
+++ b/roles/owncloud/tasks/main.json
@ -1,87 +0,0 @@
 [
 	{
 		"name": "show vars",
 		"when": "switch_show_vars",
 		"ansible.builtin.debug": {
 			"var": "vars.cfg_owncloud"
 		}
 	},
 	{
 		"name": "user",
 		"become": true,
 		"ansible.builtin.user": {
 			"name": "{{cfg_owncloud.user}}",
 			"create_home": true,
 			"home": "{{cfg_owncloud.directory}}"
 		}
 	},
 	{
 		"name": "download",
 		"become": true,
 		"become_user": "{{cfg_owncloud.user}}",
 		"ansible.builtin.get_url": {
 			"url": "https://download.owncloud.com/ocis/ocis/stable/{{cfg_owncloud.version}}/ocis-{{cfg_owncloud.version}}-{{cfg_owncloud.platform}}",
 			"dest": "{{cfg_owncloud.directory}}/ocis",
 			"mode": "u+rx"
 		}
 	},
 	{
 		"name": "directories",
 		"become": true,
 		"become_user": "{{cfg_owncloud.user}}",
 		"loop": [
 			"log"
 		],
 		"ansible.builtin.file": {
 			"state": "directory",
 			"recurse": true,
 			"path": "{{cfg_owncloud.directory}}/{{item}}"
 		}
 	},
 	{
 		"name": "csp",
 		"become": true,
 		"become_user": "{{cfg_owncloud.user}}",
 		"ansible.builtin.template": {
 			"src": "csp.yaml.j2",
 			"mode": "644",
 			"dest": "{{cfg_owncloud.directory}}/csp.yaml"
 		}
 	},
 	{
 		"name": "env",
 		"become": true,
 		"become_user": "{{cfg_owncloud.user}}",
 		"ansible.builtin.template": {
 			"src": "env.j2",
 			"mode": "644",
 			"dest": "{{cfg_owncloud.directory}}/.env"
 		}
 	},
 	{
 		"name": "setup",
 		"become": true,
 		"become_user": "{{cfg_owncloud.user}}",
 		"ansible.builtin.shell": {
 			"chdir": "{{cfg_owncloud.directory}}",
 			"cmd": "./ocis init --insecure no --admin-password={{cfg_owncloud.admin_password}}"
 		}
 	},
 	{
 		"name": "systemd unit",
 		"become": true,
 		"ansible.builtin.template": {
 			"src": "systemd_unit.j2",
 			"dest": "/etc/systemd/system/owncloud.service"
 		}
 	},
 	{
 		"name": "run",
 		"become": true,
 		"ansible.builtin.systemd_service": {
 			"name": "owncloud",
 			"enabled": true,
 			"state": "restarted"
 		}
 	}
 ]
--- a/roles/owncloud/templates/csp.yaml.j2
+++ b/roles/owncloud/templates/csp.yaml.j2
@ -1,7 +0,0 @@
 directives:
  connect-src:
    - '''self'''
    - 'https://{{cfg_owncloud.domain}}'
 {% if cfg_owncloud.authentication.kind == 'authelia' %}
    - '{{cfg_owncloud.authentication.data.url_base}}'
 {% endif %}
--- a/roles/owncloud/templates/env.j2
+++ b/roles/owncloud/templates/env.j2
@ -1,62 +0,0 @@
 ## web client
 WEB_LOG_LEVEL=info
 WEB_LOG_FILE={{cfg_owncloud.directory}}/log/web
 WEB_LOG_PRETTY=true
 WEB_LOG_COLOR=true
 {% if cfg_owncloud.authentication.kind == 'internal' %}
 {% endif %}
 {% if cfg_owncloud.authentication.kind == 'authelia' %}
 WEB_OIDC_AUTHORITY={{cfg_owncloud.authentication.data.url_base}}
 WEB_OIDC_CLIENT_ID={{cfg_owncloud.authentication.data.web.client_id}}
 WEB_OIDC_RESPONSE_TYPE=code
 WEB_OIDC_SCOPE=openid profile email groups
 WEB_OPTION_LOGIN_URL={{cfg_owncloud.authentication.data.url_base}}
 WEB_OPTION_LOGOUT_URL={{cfg_owncloud.authentication.data.url_base}}
 WEB_UI_THEME_SERVER=https://{{cfg_owncloud.domain}}
 WEB_UI_CONFIG_SERVER=https://{{cfg_owncloud.domain}}
 {% endif %}
 ## other clients
 PROXY_LOG_LEVEL=info
 PROXY_LOG_FILE={{cfg_owncloud.directory}}/log/proxy
 PROXY_LOG_PRETTY=true
 PROXY_LOG_COLOR=true
 PROXY_CSP_CONFIG_FILE_LOCATION={{cfg_owncloud.directory}}/csp.yaml
 PROXY_TLS=false
 {% if cfg_owncloud.authentication.kind == 'internal' %}
 PROXY_AUTOPROVISION_ACCOUNTS=false
 {% endif %}
 {% if cfg_owncloud.authentication.kind == 'authelia' %}
 OCIS_URL=https://{{cfg_owncloud.domain}}
 PROXY_OIDC_ISSUER={{cfg_owncloud.authentication.data.url_base}}
 PROXY_OIDC_REWRITE_WELLKNOWN=true
 PROXY_OIDC_ACCESS_TOKEN_VERIFY_METHOD=none
 PROXY_OIDC_SKIP_USER_INFO=false
 PROXY_AUTOPROVISION_ACCOUNTS=true
 PROXY_AUTOPROVISION_CLAIM_USERNAME=preferred_username
 PROXY_AUTOPROVISION_CLAIM_EMAIL=email
 PROXY_AUTOPROVISION_CLAIM_DISPLAYNAME=name
 PROXY_AUTOPROVISION_CLAIM_GROUPS=groups
 PROXY_USER_OIDC_CLAIM=preferred_username
 PROXY_USER_CS3_CLAIM=username
 {% endif %}
 ## sharing
 {% if cfg_owncloud.public_share.password_necessity == 'nothing' %}
 OCIS_SHARING_PUBLIC_SHARE_MUST_HAVE_PASSWORD=false
 OCIS_SHARING_PUBLIC_WRITEABLE_SHARE_MUST_HAVE_PASSWORD=false
 {% endif %}
 {% if cfg_owncloud.public_share.password_necessity == 'writable' %}
 OCIS_SHARING_PUBLIC_SHARE_MUST_HAVE_PASSWORD=false
 OCIS_SHARING_PUBLIC_WRITEABLE_SHARE_MUST_HAVE_PASSWORD=true
 {% endif %}
 {% if cfg_owncloud.public_share.password_necessity == 'all' %}
 OCIS_SHARING_PUBLIC_SHARE_MUST_HAVE_PASSWORD=true
 OCIS_SHARING_PUBLIC_WRITEABLE_SHARE_MUST_HAVE_PASSWORD=true
 {% endif %}
 {% if cfg_owncloud.public_share.password_policy_active %}
 OCIS_SHARING_PASSWORD_POLICY_DISABLED=false
 {% else %}
 OCIS_SHARING_PASSWORD_POLICY_DISABLED=true
 {% endif %}
--- a/roles/owncloud/templates/systemd_unit.j2
+++ b/roles/owncloud/templates/systemd_unit.j2
@ -1,15 +0,0 @@
 [Unit]
 Description=ownCloud
 After=network.target
 [Service]
 WorkingDirectory={{cfg_owncloud.directory}}
 EnvironmentFile={{cfg_owncloud.directory}}/.env
 ExecStart={{cfg_owncloud.directory}}/ocis server
 Type=simple
 Restart=always
 User={{cfg_owncloud.user}}
 [Install]
 WantedBy=default.target
 RequiredBy=network.target
--- a/roles/postgresql-for-authelia/tasks/main.json
+++ b/roles/postgresql-for-authelia/tasks/main.json
@ -39,7 +39,7 @@
 		"become_user": "postgres",
 		"community.postgresql.postgresql_privs": {
 			"state": "present",
-			"login_db": "{{var_postgresql_for_authelia_schema}}",
+			"db": "{{var_postgresql_for_authelia_schema}}",
 			"objs": "ALL_IN_SCHEMA",
 			"roles": "{{var_postgresql_for_authelia_username}}",
 			"privs": "ALL",
--- a/roles/postgresql-for-forgejo/defaults/main.json
+++ b/roles/postgresql-for-forgejo/defaults/main.json
@ -1,5 +0,0 @@
 {
 	"var_postgresql_for_forgejo_username": "forgejo_user",
 	"var_postgresql_for_forgejo_password": "REPLACE_ME",
 	"var_postgresql_for_forgejo_schema": "forgejo"
 }
--- a/roles/postgresql-for-forgejo/tasks/main.json
+++ b/roles/postgresql-for-forgejo/tasks/main.json
@ -1,49 +0,0 @@
 [
 	{
 		"name": "packages",
 		"become": true,
 		"ansible.builtin.apt": {
 			"update_cache": true,
 			"pkg": [
 				"acl",
 				"python3-psycopg2"
 			]
 		}
 	},
 	{
 		"name": "user",
 		"become": true,
 		"become_user": "postgres",
 		"community.postgresql.postgresql_user": {
 			"state": "present",
 			"name": "{{var_postgresql_for_forgejo_username}}",
 			"password": "{{var_postgresql_for_forgejo_password}}"
 		},
 		"environment": {
 			"PGOPTIONS": "-c password_encryption=scram-sha-256"
 		}
 	},
 	{
 		"name": "schema",
 		"become": true,
 		"become_user": "postgres",
 		"community.postgresql.postgresql_db": {
 			"state": "present",
 			"name": "{{var_postgresql_for_forgejo_schema}}",
 			"owner": "{{var_postgresql_for_forgejo_username}}"
 		}
 	},
 	{
 		"name": "rights",
 		"become": true,
 		"become_user": "postgres",
 		"community.postgresql.postgresql_privs": {
 			"state": "present",
 			"login_db": "{{var_postgresql_for_forgejo_schema}}",
 			"objs": "ALL_IN_SCHEMA",
 			"roles": "{{var_postgresql_for_forgejo_username}}",
 			"privs": "ALL",
 			"grant_option": true
 		}
 	}
 ]
--- a/roles/postgresql-for-gitea/defaults/main.json
+++ b/roles/postgresql-for-gitea/defaults/main.json
@ -0,0 +1,5 @@
 {
 	"var_postgresql_for_gitea_username": "gitea_user",
 	"var_postgresql_for_gitea_password": "REPLACE_ME",
 	"var_postgresql_for_gitea_schema": "gitea"
 }
--- a/Show more
+++ b/Show more
Author	SHA1	Message	Date
Christian Fraß	c627b03396	[fix] role:authelia-for-gitea	2024-07-09 17:54:58 +02:00
Christian Fraß	c0c2cd0d60	[fix] role:authelia-for-gitea	2024-07-09 17:35:20 +02:00
Christian Fraß	8becae1af3	[fix] role:gitea	2024-07-09 17:30:46 +02:00
Christian Fraß	0569208c4c	[fix] role:gitea	2024-07-09 17:12:01 +02:00
Christian Fraß	24ec20fb5b	[fix] roleauthelia	2024-07-09 17:10:54 +02:00
Christian Fraß	ce5ab8e38a	[fix] role:gitea	2024-07-09 14:12:35 +02:00
Christian Fraß	5fad225925	[fix] role:gitea	2024-07-09 14:06:16 +02:00
Christian Fraß	78c7add038	Merge branch 'dev-tls_switch' into dev-gitea	2024-07-09 13:51:05 +02:00
Christian Fraß	f653df336e	[fix] role:gitea-and-nginx	2024-07-09 13:23:36 +02:00
Christian Fraß	82861a4778	[fix] role:gitea	2024-07-09 13:22:48 +02:00
Christian Fraß	01b76d998d	[fix] role:gitea	2024-07-09 13:14:26 +02:00
Christian Fraß	fd9a8ee494	[fix] role:gitea-and-nginx	2024-07-09 13:08:09 +02:00
Christian Fraß	573a98965d	[fix] role:gitea	2024-07-09 12:49:38 +02:00
Christian Fraß	fa273c1f04	[fix] role:gitea	2024-07-09 12:35:40 +02:00
Christian Fraß	3cd7aaf702	[fix] role:gitea	2024-07-09 12:33:10 +02:00
Christian Fraß	815ecf3115	[add] role:gitea-and-nginx	2024-07-04 22:54:59 +02:00
Christian Fraß	0da6992921	[mod] roleconf path	2024-07-04 22:54:49 +02:00
Christian Fraß	4628d8812c	[add] role:postgresql-for-gitea	2024-07-04 22:07:02 +02:00
Christian Fraß	e4dc72b02d	[add] role:authelia-for-gitea	2024-07-04 22:04:35 +02:00
Christian Fraß	3008acbee4	[add] role:gitea	2024-07-04 21:55:22 +02:00
Christian Fraß	8acbd0e794	[int]	2024-07-04 19:49:36 +02:00
`@ -1,4 +1,4 @@`
	`# Ansible Collection - roydfalk.standard`	`# Ansible Collection - linke.standard`

	`Sammlung von allgemeinen, wiederverwendbaren Ansible-Rollen`	`Sammlung von allgemeinen, wiederverwendbaren Ansible-Rollen`
		`@ -0,0 +1,3 @@`
							`## Verweise`

							`- [Gitea-Dokumentation](https://docs.gitea.com/next/administration/reverse-proxies#nginx)`