[task-393]

[task-410]
[del] role:sqlite-for-hedgedoc
2025-10-23 23:41:31 +02:00 · 2025-10-15 08:10:38 +02:00 · 2025-10-09 01:49:33 +02:00 · 2025-10-09 01:49:09 +02:00 · 2025-10-09 01:47:49 +02:00 · 2025-10-09 01:47:20 +02:00
102 changed files with 2630 additions and 910 deletions
--- a/README.md
+++ b/README.md
@ -1,4 +1,4 @@
-# Ansible Collection - linke.standard
+# Ansible Collection - roydfalk.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: linke
+namespace: fenris 

 # The name of the collection. Has the same character restrictions as 'namespace'
-name: standard
+name: base 

 # 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:
- Royd Falk <roydfalk@folksprak.org>
+- Fenris <fenris@folksprak.org>
 - Marius <marius@rasumi.net>

 ### OPTIONAL but strongly recommended
 # A short summary description of the collection
-description: "Sammlung von allgemeinen, wiederverwendbaren Ansible-Rollen (ursprünglich für Infrastruktur der Partei 'DIE LINKE.')"
+description: "Sammlung von allgemeinen, wiederverwendbaren Ansible-Rollen"

 # 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
@ -0,0 +1,24 @@
+{
+	"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,4 +1,5 @@
 {
-	"var_authelia_and_nginx_domain": "authelia.example.org",
-	"var_authelia_and_nginx_tls_mode": "force"
+	"cfg_authelia_and_nginx_defaults": {
+		"tls_mode": "force"
+	}
 }
--- a/roles/authelia-and-nginx/tasks/main.json
+++ b/roles/authelia-and-nginx/tasks/main.json
@ -1,4 +1,11 @@
 [
+	{
+		"name": "show vars",
+		"when": "switch_show_vars",
+		"ansible.builtin.debug": {
+			"var": "vars.cfg_authelia_and_nginx"
+		}
+	},
 	{
 		"name": "deactivate default site",
 		"become": true,
@ -12,7 +19,7 @@
 		"become": true,
 		"ansible.builtin.template": {
 			"src": "conf.j2",
-			"dest": "/etc/nginx/sites-available/{{var_authelia_and_nginx_domain}}"
+			"dest": "/etc/nginx/sites-available/{{cfg_authelia_and_nginx.domain}}"
 		}
 	},
 	{
@ -20,8 +27,8 @@
 		"become": true,
 		"ansible.builtin.file": {
 			"state": "link",
-			"src": "/etc/nginx/sites-available/{{var_authelia_and_nginx_domain}}",
-			"dest": "/etc/nginx/sites-enabled/{{var_authelia_and_nginx_domain}}"
+			"src": "/etc/nginx/sites-available/{{cfg_authelia_and_nginx.domain}}",
+			"dest": "/etc/nginx/sites-enabled/{{cfg_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 {{var_authelia_and_nginx_domain}};
+	server_name {{cfg_authelia_and_nginx.domain}};
 	
 	listen 80;
 	listen [::]:80;
 	
-{% if (var_authelia_and_nginx_tls_mode == 'force') %}
+{% if (cfg_authelia_and_nginx.tls_mode == 'force') %}
 	return 301 https://$http_host$request_uri;
 {% else %}
 {{ authelia_common() }}
 {% endif %}
 }

-{% if (var_authelia_and_nginx_tls_mode != 'disable') %}
+{% if (cfg_authelia_and_nginx.tls_mode != 'disable') %}
 server {
-	server_name {{var_authelia_and_nginx_domain}};
+	server_name {{cfg_authelia_and_nginx.domain}};
 	
 	listen [::]:443 ssl http2;
 	listen 443 ssl http2;
 	
-	ssl_certificate_key /etc/ssl/private/{{var_authelia_and_nginx_domain}}.pem;
-	ssl_certificate /etc/ssl/fullchains/{{var_authelia_and_nginx_domain}}.pem;
+	ssl_certificate_key /etc/ssl/private/{{cfg_authelia_and_nginx.domain}}.pem;
+	ssl_certificate /etc/ssl/fullchains/{{cfg_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
@ -1,15 +0,0 @@
-{
-	"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,4 +1,12 @@
 [
+	{
+		"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": "{{var_authelia_for_dokuwiki_client_secret}}",
+	"client_secret": "{{temp_authelia_for_dokuwiki_client_secret_hashed.stdout}}",
 	"client_name": "DokuWiki",
 	"public": false,
 	"authorization_policy": "one_factor",
--- a/roles/authelia-for-forgejo/tasks/main.json
+++ b/roles/authelia-for-forgejo/tasks/main.json
@ -1,4 +1,12 @@
 [
+	{
+		"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,
--- a/roles/authelia-for-forgejo/templates/authelia-client-conf.json.j2
+++ b/roles/authelia-for-forgejo/templates/authelia-client-conf.json.j2
@ -1,6 +1,6 @@
 {
 	"client_id": "{{var_authelia_for_forgejo_client_id}}",
-	"client_secret": "{{var_authelia_for_forgejo_client_secret}}",
+	"client_secret": "{{temp_authelia_for_forgejo_client_secret_hashed.stdout}}",
 	"client_name": "Forgejo",
 	"public": false,
 	"authorization_policy": "one_factor",
--- a/roles/authelia-for-gitlab/tasks/main.json
+++ b/roles/authelia-for-gitlab/tasks/main.json
@ -1,4 +1,12 @@
 [
+	{
+		"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": "{{var_authelia_for_gitlab_client_secret}}",
+	"client_secret": "{{temp_authelia_for_gitlab_client_secret_hashed.stdout}}",
 	"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
@ -0,0 +1,25 @@
+{
+	"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 @@
 {
-	"var_authelia_for_hedgedoc_hedgedoc_url_base": "https://hedgedoc.example.org",
-	"var_authelia_for_hedgedoc_client_id": "hedgedoc",
-	"var_authelia_for_hedgedoc_client_secret": "REPLACE_ME"
+	"cfg_authelia_for_hedgedoc_defaults": {
+		"client_id": "hedgedoc"
+	}
 }
--- a/roles/authelia-for-hedgedoc/tasks/main.json
+++ b/roles/authelia-for-hedgedoc/tasks/main.json
@ -1,4 +1,19 @@
 [
+	{
+		"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": "{{var_authelia_for_hedgedoc_client_id}}",
-	"client_secret": "{{var_authelia_for_hedgedoc_client_secret}}",
+	"client_id": "{{cfg_authelia_for_hedgedoc.client_id}}",
+	"client_secret": "{{temp_authelia_for_hedgedoc_client_secret_hashed.stdout}}",
 	"client_name": "Hedgedoc",
 	"public": false,
 	"authorization_policy": "one_factor",
@ -10,11 +10,7 @@
 		"profile"
 	],
 	"redirect_uris": [
-		"{{var_authelia_for_hedgedoc_hedgedoc_url_base}}/auth/oauth2/callback"
-	],
-	"grant_types": [
-		"refresh_token",
-		"authorization_code"
+		"{{cfg_authelia_for_hedgedoc.hedgedoc_url_base}}/auth/oauth2/callback"
 	],
 	"response_types": [
 		"code"
--- a/roles/authelia-for-owncloud/cfg.schema.json
+++ b/roles/authelia-for-owncloud/cfg.schema.json
@ -0,0 +1,97 @@
+{
+	"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,8 +1,19 @@
 {
-	"var_authelia_for_owncloud_owncloud_url_base": "https://owncloud.example.org",
-	"var_authelia_for_owncloud_web_client_id": "owncloud_web",
-	"var_authelia_for_owncloud_android_client_id": "owncloud_android",
-	"var_authelia_for_owncloud_android_client_secret": "REPLACE_ME",
-	"var_authelia_for_owncloud_ios_client_id": "owncloud_ios",
-	"var_authelia_for_owncloud_ios_client_secret": "REPLACE_ME"
+	"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/tasks/main.json
+++ b/roles/authelia-for-owncloud/tasks/main.json
@ -1,18 +1,96 @@
 [
 	{
-		"name": "configuration | emplace",
-		"become": true,
-		"loop": [
-			{"src": "authelia-client-conf-web.json.j2", "dest": "/etc/authelia/conf.d/clients/owncloud-web.json"},
-			{"src": "authelia-client-conf-desktop.json.j2", "dest": "/etc/authelia/conf.d/clients/owncloud-desktop.json"},
-			{"src": "authelia-client-conf-android.json.j2", "dest": "/etc/authelia/conf.d/clients/owncloud-android.json"},
-			{"src": "authelia-client-conf-ios.json.j2", "dest": "/etc/authelia/conf.d/clients/owncloud-ios.json"}
-		],
-		"ansible.builtin.template": {
-			"src": "{{item.src}}",
-			"dest": "{{item.dest}}"
+		"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,
--- 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,16 +1,33 @@
 {
-	"client_id": "{{var_authelia_for_owncloud_android_client_id}}",
-	"client_secret": "{{var_authelia_for_owncloud_android_client_secret}}",
+	"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",
-		"offline_access"
+		"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,17 +1,33 @@
 {
-	"client_id": "xdXOt13JKxym1B1QcEncf2XDkLAexMBFwiT9j6EfhhHFJhs2KM9jbjTmf8JBXE69",
-	"client_secret": "UBntmLjC2yYCeHwsyj73Uwo9TAaecAetRwMw0xYcvNL9yRdLSUi0hUAHfvCHFeFh",
+	"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",
-		"offline_access"
+		"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,17 +1,33 @@
 {
-	"client_id": "{{var_authelia_for_owncloud_ios_client_id}}",
-	"client_secret": "{{var_authelia_for_owncloud_ios_client_secret}}",
+	"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",
-		"offline_access"
+		"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,20 +1,33 @@
 {
-	"client_id": "{{var_authelia_for_owncloud_web_client_id}}",
+	"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",
-		"email",
+		"offline_access",
+		"groups",
 		"profile",
-		"groups"
+		"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"
 	],
-	"redirect_uris": [
-		"{{var_authelia_for_owncloud_owncloud_url_base}}",
-		"{{var_authelia_for_owncloud_owncloud_url_base}}/oidc-callback.html",
-		"{{var_authelia_for_owncloud_owncloud_url_base}}/oidc-silent-redirect.html"
-	]
+	"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-owncloud/vardef.json
+++ b/roles/authelia-for-owncloud/vardef.json
@ -1,26 +0,0 @@
-{
-	"owncloud_url_base": {
-		"type": "string",
-		"mandatory": false
-	},
-	"web_client_id": {
-		"type": "string",
-		"mandatory": false
-	},
-	"android_client_id": {
-		"type": "string",
-		"mandatory": false
-	},
-	"android_client_secret": {
-		"type": "string",
-		"mandatory": false
-	},
-	"ios_client_id": {
-		"type": "string",
-		"mandatory": false
-	},
-	"ios_client_secret": {
-		"type": "string",
-		"mandatory": false
-	}
-}
--- a/roles/authelia-for-synapse/tasks/main.json
+++ b/roles/authelia-for-synapse/tasks/main.json
@ -1,4 +1,12 @@
 [
+	{
+		"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": "{{var_authelia_for_synapse_client_secret}}",
+	"client_secret": "{{temp_authelia_for_synapse_client_secret_hashed.stdout}}",
 	"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
@ -0,0 +1,5 @@
+{
+	"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
@ -0,0 +1,8 @@
+## 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
@ -0,0 +1,33 @@
+[
+	{
+		"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
@ -0,0 +1,17 @@
+{
+	"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,4 +1,12 @@
 [
+	{
+		"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": "{{var_authelia_for_vikunja_client_secret}}",
+	"client_secret": "{{temp_authelia_for_vikunja_client_secret_hashed.stdout}}",
 	"client_name": "Vikunja",
 	"public": false,
 	"authorization_policy": "one_factor",
--- a/roles/authelia-for-wiki_js/tasks/main.json
+++ b/roles/authelia-for-wiki_js/tasks/main.json
@ -1,4 +1,12 @@
 [
+	{
+		"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,
--- 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,6 +1,6 @@
 {
 	"client_id": "{{var_authelia_for_wiki_js_client_id}}",
-	"client_secret": "{{var_authelia_for_wiki_js_client_secret}}",
+	"client_secret": "{{temp_authelia_for_wiki_js_client_secret_hashed.stdout}}",
 	"client_name": "Wiki.js",
 	"public": false,
 	"authorization_policy": "one_factor",
--- a/roles/authelia/cfg.schema.json
+++ b/roles/authelia/cfg.schema.json
@ -0,0 +1,449 @@
+{
+	"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,39 +1,45 @@
 {
-	"var_authelia_version": "4.37.5",
-	"var_authelia_architecture": "amd64",
-	"var_authelia_listen_address": "0.0.0.0",
-	"var_authelia_jwt_secret": "REPLACE_ME",
-	"var_authelia_users_file_path": "/var/authelia/users.yml",
-	"var_authelia_log_file_path": "/var/authelia/log.jsonl",
-	"var_authelia_domain": "authelia.example.org",
-	"var_authelia_redirect_url": "https://example.org",
-	"var_authelia_session_domain": "example.org",
-	"var_authelia_session_secret": "REPLACE_ME",
-	"var_authelia_storage_encryption_key": "REPLACE_ME",
-	"var_authelia_storage_kind": "sqlite",
-	"var_authelia_storage_data_sqlite_path": "/var/authelia/state.db",
-	"var_authelia_storage_data_postgresql_host": "localhost",
-	"var_authelia_storage_data_postgresql_port": 5432,
-	"var_authelia_storage_data_postgresql_username": "authelia_user",
-	"var_authelia_storage_data_postgresql_password": "REPLACE_ME",
-	"var_authelia_storage_data_postgresql_schema": "authelia",
-	"var_authelia_storage_data_mariadb_host": "localhost",
-	"var_authelia_storage_data_mariadb_port": 3306,
-	"var_authelia_storage_data_mariadb_username": "authelia_user",
-	"var_authelia_storage_data_mariadb_password": "REPLACE_ME",
-	"var_authelia_storage_data_mariadb_schema": "authelia",
-	"var_authelia_ntp_server": "time.cloudflare.com:123",
-	"var_authelia_password_reset_enabled": false,
-	"var_authelia_password_reset_custom_url": null,
-	"var_authelia_notification_mode": "smtp",
-	"var_authelia_notification_file_path": "/var/authelia/notifications",
-	"var_authelia_notification_smtp_host": "smtp.example.org",
-	"var_authelia_notification_smtp_port": 465,
-	"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",
-	"var_authelia_oidc_lifespan_access_token": "1h",
-	"var_authelia_oidc_lifespan_refresh_token": "1m",
-	"var_authelia_oidc_cors_endpoints": null
+	"cfg_authelia_defaults": {
+		"listen_address": "0.0.0.0",
+		"users_file_path": "/var/authelia/users.yml",
+		"log_file_path": "/var/authelia/log.jsonl",
+		"storage": {
+			"kind": "sqlite",
+			"data": {
+				"path": "/var/authelia/state.db"
+			}
+		},
+		"ntp_server": "time.cloudflare.com:123",
+		"password_reset": {
+			"enabled": false,
+			"custom_url": null
+		},
+		"notification": {
+			"kind": "file",
+			"data": {
+				"path": "/var/authelia/notifications"
+			}
+		},
+		"oidc": {
+			"lifespan": {
+				"default": {
+					"access_token": "1d",
+					"refresh_token": "1h"
+				},
+				"custom": {
+					"long": {
+						"access_token": "2d",
+						"refresh_token": "3d"
+					}
+				}
+			},
+			"cors_endpoints": [
+				"authorization",
+				"token",
+				"revocation",
+				"introspection",
+				"userinfo"
+			]
+		}
+	}
 }
--- a/roles/authelia/tasks/main.json
+++ b/roles/authelia/tasks/main.json
@ -1,32 +1,45 @@
 [
 	{
-		"name": "packages | prerequisites",
+		"name": "show vars",
+		"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": "packages | keys",
+				"name": "keys",
 				"become": true,
-		"ansible.builtin.apt_key": {
-			"url": "https://apt.authelia.com/organization/signing.asc"
+				"ansible.builtin.get_url": {
+					"url": "https://www.authelia.com/keys/authelia-security.gpg",
+					"dest": "/usr/share/keyrings/authelia-security.gpg"
 				}
 			},
 			{
-		"name": "packages | repository",
+				"name": "repository",
 				"become": true,
-		"ansible.builtin.apt_repository": {
-			"repo": "deb https://apt.authelia.com/stable/debian/debian/ all main"
+				"ansible.builtin.shell": {
+					"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",
+					"creates": "/etc/apt/sources.list.d/authelia.list"
 				}

 			},
 			{
-		"name": "packages | installation",
+				"name": "installation",
 				"become": true,
 				"ansible.builtin.apt": {
 					"update_cache": true,
@ -37,6 +50,8 @@
 						"authelia"
 					]
 				}
+			}
+		]
 	},
 	{
 		"name": "generate private key for signing OIDC JWTs",
@ -49,6 +64,9 @@
 		},
 		"register": "temp_tls_result"
 	},
+	{
+		"name": "configuration",
+		"block": [
 			{
 				"name": "configuration | compose script",
 				"become": true,
@ -84,40 +102,51 @@
 				"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",
-			"path": "{{var_authelia_log_file_path | dirname}}"
+			"owner": "authelia",
+			"group": "authelia",
+			"path": "{{cfg_authelia.log_file_path | dirname}}"
 		}
 	},
 	{
-		"name": "users | directory",
+		"name": "users",
+		"block": [
+			{
+				"name": "directory",
 				"become": true,
 				"ansible.builtin.file": {
 					"state": "directory",
-			"path": "{{var_authelia_users_file_path | dirname}}"
+					"owner": "authelia",
+					"group": "authelia",
+					"path": "{{cfg_authelia.users_file_path | dirname}}"
 				}
 			},
 			{
-		"name": "users | initial file",
+				"name": "initial file",
 				"become": true,
 				"ansible.builtin.template": {
 					"src": "users.yml.j2",
-			"dest": "{{var_authelia_users_file_path}}",
+					"dest": "{{cfg_authelia.users_file_path}}",
 					"force": false
 				}
 			},
 			{
-		"name": "users | management script",
+				"name": "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": "{{var_authelia_jwt_secret}}"
+			"jwt_secret": "{{cfg_authelia.jwt_secret}}"
 		}
 	},
 	"default_2fa_method": "totp",
 	"server": {
-		"address": "{{var_authelia_listen_address}}:9091",
+		"address": "{{cfg_authelia.listen_address}}:9091",
 		"endpoints": {
 			"enable_pprof": false,
 			"enable_expvars": false
@ -17,7 +17,7 @@
 	"log": {
 		"level": "info",
 		"format": "json",
-		"file_path": "{{var_authelia_log_file_path}}",
+		"file_path": "{{cfg_authelia.log_file_path}}",
 		"keep_stdout": false
 	},
 	"telemetry": {
@ -43,7 +43,7 @@
 		"user_verification": "preferred"
 	},
 	"ntp": {
-		"address": "{{var_authelia_ntp_server}}",
+		"address": "{{cfg_authelia.ntp_server}}",
 		"version": 4,
 		"max_desync": "3s",
 		"disable_startup_check": false,
@ -51,16 +51,16 @@
 	},
 	"authentication_backend": {
 		"password_reset": {
-{% if var_authelia_password_reset_enabled %}
+{% if cfg_authelia.password_reset.enabled %}
 			"disable": false,
 {% else %}
 			"disable": true,
 {% endif %}
-			"custom_url": "{{var_authelia_password_reset_custom_url}}"
+			"custom_url": {{cfg_authelia.password_reset.custom_url | to_json}}
 		},
 		"refresh_interval": "5m",
 		"file": {
-			"path": "{{var_authelia_users_file_path}}",
+			"path": "{{cfg_authelia.users_file_path}}",
 			"watch": true,
 			"search": {
 				"email": false,
@ -121,15 +121,15 @@
 	"session": {
 		"name": "authelia_session",
 		"same_site": "lax",
-		"secret": "{{var_authelia_session_secret}}",
+		"secret": "{{cfg_authelia.session_secret}}",
 		"expiration": "1h",
 		"inactivity": "5m",
 		"remember_me": "1M",
 		"cookies": [
 			{
-				"domain": "{{var_authelia_session_domain}}",
-				"authelia_url": "https://{{var_authelia_domain}}/",
-				"default_redirection_url": "{{var_authelia_redirect_url}}"
+				"domain": "{{cfg_authelia.session_domain}}",
+				"authelia_url": "https://{{cfg_authelia.domain}}/",
+				"default_redirection_url": "{{cfg_authelia.redirect_url}}"
 			}
 		]
 	},
@ -139,45 +139,44 @@
 		"ban_time": "5m"
 	},
 	"storage": {
-		"encryption_key": "{{var_authelia_storage_encryption_key}}",
-{% if var_authelia_storage_kind == "sqlite" %}
+		"encryption_key": "{{cfg_authelia.storage_encryption_key}}",
+{% if cfg_authelia.storage.kind == "sqlite" %}
 		"local": {
-			"path": "{{var_authelia_storage_data_sqlite_path}}"
+			"path": "{{cfg_authelia.storage.data.path}}"
 		}
 {% endif %}
-{% if var_authelia_storage_kind == "postgresql" %}
+{% if cfg_authelia.storage.kind == "postgresql" %}
 		"postgres": {
-			"address": "{{var_authelia_storage_data_postgresql_host}}:{{var_authelia_storage_data_postgresql_port | string}}",
+			"address": "{{cfg_authelia.storage.data.host}}:{{cfg_authelia.storage.data.port | string}}",
 			"schema": "public",
-			"username": "{{var_authelia_storage_data_postgresql_username}}",
-			"password": "{{var_authelia_storage_data_postgresql_password}}",
-			"database": "{{var_authelia_storage_data_postgresql_schema}}"
+			"username": "{{cfg_authelia.storage.data.username}}",
+			"password": "{{cfg_authelia.storage.data.password}}",
+			"database": "{{cfg_authelia.storage.data.schema}}"
 		}
 {% endif %}
-{% if var_authelia_storage_kind == "mariadb" %}
+{% if cfg_authelia.storage.kind == "mariadb" %}
 		"mysql": {
-			"host": "{{var_authelia_storage_data_mariadb_host}}",
-			"port": {{var_authelia_storage_data_mariadb_port | string}},
-			"username": "{{var_authelia_storage_data_mariadb_username}}",
-			"password": "{{var_authelia_storage_data_mariadb_password}}",
-			"database": "{{var_authelia_storage_data_mariadb_schema}}"
+			"host": "{{cfg_authelia.storage.data.host}}",
+			"port": {{cfg_authelia.storage.data.port | string}},
+			"username": "{{cfg_authelia.storage.data.username}}",
+			"password": "{{cfg_authelia.storage.data.password}}",
+			"database": "{{cfg_authelia.storage.data.schema}}"
 		}
 {% endif %}
 	},
 	"notifier": {
 		"disable_startup_check": true,
-{% if var_authelia_notification_mode == "file" %}
+{% if cfg_authelia.notification.kind == "file" %}
 		"filesystem": {
-			"filename": "{{var_authelia_notification_file_path}}"
+			"filename": "{{cfg_authelia.notification.data.path}}"
 		}
 {% endif %}
-{% if var_authelia_notification_mode == "smtp" %}
+{% if cfg_authelia.notification.kind == "smtp" %}
 		"smtp": {
-			"host": "{{var_authelia_notification_smtp_host}}",
-			"port": {{var_authelia_notification_smtp_port | string}},
-			"username": "{{var_authelia_notification_smtp_username}}",
-			"password": "{{var_authelia_notification_smtp_password}}",
-			"sender": "{{var_authelia_notification_smtp_sender}}",
+			"address": "{{cfg_authelia.notification.data.host}}:{{cfg_authelia.notification.data.port | string}}",
+			"username": "{{cfg_authelia.notification.data.username}}",
+			"password": "{{cfg_authelia.notification.data.password}}",
+			"sender": "{{cfg_authelia.notification.data.sender}}",
 			"disable_require_tls": false,
 			"disable_html_emails": false,
 			"tls": {
@ -188,17 +187,23 @@
 	},
 	"identity_providers": {
 		"oidc": {
-			"hmac_secret": "{{var_authelia_oidc_hmac_secret}}",
-			"issuer_private_key": "{{temp_tls_result.privatekey | replace('\n', '\\n')}}",
+			"hmac_secret": "{{cfg_authelia.oidc.hmac_secret}}",
+			"jwks": [
+				{
+					"algorithm": "RS256",
+					"key": "{{temp_tls_result.privatekey | replace('\n', '\\n')}}"
+				}
+			],
 			"lifespans": {
-				"access_token": "{{var_authelia_oidc_lifespan_access_token}}",
-				"refresh_token": "{{var_authelia_oidc_lifespan_refresh_token}}"
+				"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 var_authelia_oidc_cors_endpoints == None %}
+{% if cfg_authelia.oidc.cors_endpoints == None %}
 {% else %}
-				,"endpoints": {{var_authelia_oidc_cors_endpoints | to_json}}
+				,"endpoints": {{cfg_authelia.oidc.cors_endpoints | to_json}}
 {% endif %}
 			},
 			"clients": [
--- a/roles/authelia/vardef.json
+++ b/roles/authelia/vardef.json
@ -1,169 +0,0 @@
-{
-	"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
-	},
-	"oidc_lifespan_access_token": {
-		"nullable": true,
-		"type": "string",
-		"mandatory": false
-	},
-	"oidc_lifespan_refresh_token": {
-		"nullable": true,
-		"type": "string",
-		"mandatory": false
-	},
-	"oidc_cors_endpoints": {
-		"nullable": true,
-		"type": "array",
-		"items": {
-			"type": "string",
-			"enum": [
-				"authorization",
-				"pushed-authorization-request",
-				"token",
-				"revocation",
-				"introspection",
-				"userinfo"
-			]
-		},
-		"mandatory": false
-	}
-}
--- a/roles/forgejo/defaults/main.json
+++ b/roles/forgejo/defaults/main.json
@ -2,7 +2,7 @@
 	"var_forgejo_user": "forgejo",
 	"var_forgejo_directory_main": "/opt/forgejo",
 	"var_forgejo_directory_repositories": "/var/forgejo/repositories",
-	"var_forgejo_version": "7.0.5",
+	"var_forgejo_version": "10.0.3",
 	"var_forgejo_platform": "linux-amd64",
 	"var_forgejo_secret_key": "REPLACE_ME",
 	"var_forgejo_internal_token": "REPLACE_ME",
--- a/roles/hedgedoc-and-nginx/cfg.schema.json
+++ b/roles/hedgedoc-and-nginx/cfg.schema.json
@ -0,0 +1,24 @@
+{
+	"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,4 +1,5 @@
 {
-	"var_hedgedoc_and_nginx_domain": "hedgedoc.example.org",
-	"var_hedgedoc_and_nginx_tls_mode": "force"
+	"cfg_hedgedoc_and_nginx_defaults": {
+		"tls_mode": "force"
+	}
 }
--- a/roles/hedgedoc-and-nginx/tasks/main.json
+++ b/roles/hedgedoc-and-nginx/tasks/main.json
@ -1,4 +1,11 @@
 [
+	{
+		"name": "show vars",
+		"when": "switch_show_vars",
+		"ansible.builtin.debug": {
+			"var": "vars.cfg_hedgedoc_and_nginx"
+		}
+	},
 	{
 		"name": "deactivate default site",
 		"become": true,
@ -12,7 +19,7 @@
 		"become": true,
 		"ansible.builtin.template": {
 			"src": "conf.j2",
-			"dest": "/etc/nginx/sites-available/{{var_hedgedoc_and_nginx_domain}}"
+			"dest": "/etc/nginx/sites-available/{{cfg_hedgedoc_and_nginx.domain}}"
 		}
 	},
 	{
@ -20,8 +27,8 @@
 		"become": true,
 		"ansible.builtin.file": {
 			"state": "link",
-			"src": "/etc/nginx/sites-available/{{var_hedgedoc_and_nginx_domain}}",
-			"dest": "/etc/nginx/sites-enabled/{{var_hedgedoc_and_nginx_domain}}"
+			"src": "/etc/nginx/sites-available/{{cfg_hedgedoc_and_nginx.domain}}",
+			"dest": "/etc/nginx/sites-enabled/{{cfg_hedgedoc_and_nginx.domain}}"
 		}
 	},
 	{
--- a/roles/hedgedoc-and-nginx/templates/conf.j2
+++ b/roles/hedgedoc-and-nginx/templates/conf.j2
@ -24,27 +24,27 @@ map $http_upgrade $connection_upgrade {
 {% endmacro %}

 server {
-	server_name {{var_hedgedoc_and_nginx_domain}};
+	server_name {{cfg_hedgedoc_and_nginx.domain}};
 	
 	listen 80;
 	listen [::]:80;
 	
-{% if (var_element_and_nginx_tls_mode == 'force') %}
+{% if (cfg_hedgedoc_and_nginx.tls_mode == 'force') %}
 	return 301 https://$http_host$request_uri;
 {% else %}
 {{ hedgedoc_common() }}
 {% endif %}
 }

-{% if (var_hedgedoc_and_nginx_tls_mode != 'disable') %}
+{% if (cfg_hedgedoc_and_nginx.tls_mode != 'disable') %}
 server {
-	server_name {{var_hedgedoc_and_nginx_domain}};
+	server_name {{cfg_hedgedoc_and_nginx.domain}};
 	
 	listen [::]:443 ssl http2;
 	listen 443 ssl http2;
 	
-	ssl_certificate_key /etc/ssl/private/{{var_hedgedoc_and_nginx_domain}}.pem;
-	ssl_certificate /etc/ssl/fullchains/{{var_hedgedoc_and_nginx_domain}}.pem;
+	ssl_certificate_key /etc/ssl/private/{{cfg_hedgedoc_and_nginx.domain}}.pem;
+	ssl_certificate /etc/ssl/fullchains/{{cfg_hedgedoc_and_nginx.domain}}.pem;
 	include /etc/nginx/ssl-hardening.conf;
 	
 {{ hedgedoc_common() }}
--- a/roles/hedgedoc-and-nginx/vardef.json
+++ b/roles/hedgedoc-and-nginx/vardef.json
@ -1,15 +0,0 @@
-{
-	"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
@ -0,0 +1,248 @@
+{
+	"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,21 +1,22 @@
 {
-	"var_hedgedoc_user_name": "hedgedoc",
-	"var_hedgedoc_directory": "/opt/hedgedoc",
-	"var_hedgedoc_version": "1.9.9",
-	"var_hedgedoc_session_secret": "REPLACE_ME",
-	"var_hedgedoc_database_kind": "sqlite",
-	"var_hedgedoc_database_data_sqlite_path": "/var/hedgedoc/data.sqlite",
-	"var_hedgedoc_database_data_postgresql_host": "localhost",
-	"var_hedgedoc_database_data_postgresql_port": 5432,
-	"var_hedgedoc_database_data_postgresql_username": "hedgedoc_user",
-	"var_hedgedoc_database_data_postgresql_password": "REPLACE_ME",
-	"var_hedgedoc_database_data_postgresql_schema": "hedgedoc",
-	"var_hedgedoc_domain": "hedgedoc.example.org",
-	"var_hedgedoc_authentication_kind": "authelia",
-	"var_hedgedoc_authentication_data_authelia_client_id": "hedgedoc",
-	"var_hedgedoc_authentication_data_authelia_client_secret": "REPLACE_ME",
-	"var_hedgedoc_authentication_data_authelia_url_base": "https://authelia.example.org",
-	"var_hedgedoc_guest_allow_create": false,
-	"var_hedgedoc_guest_allow_change": false,
-	"var_hedgedoc_free_names_mode": "authed"
+	"cfg_hedgedoc_defaults": {
+		"user_name": "hedgedoc",
+		"directory": "/opt/hedgedoc",
+		"version": "1.10.3",
+		"database": {
+			"kind": "sqlite",
+			"data": {
+				"path": "/var/hedgedoc/data.sqlite"
+			}
+		},
+		"authentication": {
+			"kind": "internal",
+			"data": {
+			}
+		},
+		"guest_allow_create": false,
+		"guest_allow_change": false,
+		"free_names_mode": "authed",
+		"log_level": "error"
+	}
 }
--- a/roles/hedgedoc/tasks/main.json
+++ b/roles/hedgedoc/tasks/main.json
@ -1,4 +1,11 @@
 [
+	{
+		"name": "show vars",
+		"when": "switch_show_vars",
+		"ansible.builtin.debug": {
+			"var": "vars.cfg_hedgedoc"
+		}
+	},
 	{
 		"name": "packages",
 		"become": true,
@ -26,16 +33,41 @@
 		"name": "user",
 		"become": true,
 		"ansible.builtin.user": {
-			"name": "{{var_hedgedoc_user_name}}",
+			"name": "{{cfg_hedgedoc.user_name}}",
 			"create_home": true,
-			"home": "{{var_hedgedoc_directory}}"
+			"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/{{var_hedgedoc_version}}/hedgedoc-{{var_hedgedoc_version}}.tar.gz",
+			"url": "https://github.com/hedgedoc/hedgedoc/releases/download/{{cfg_hedgedoc.version}}/hedgedoc-{{cfg_hedgedoc.version}}.tar.gz",
 			"dest": "/tmp/hedgedoc.tar.gz"
 		}
 	},
@ -45,8 +77,8 @@
 		"ansible.builtin.unarchive": {
 			"remote_src": true,
 			"src": "/tmp/hedgedoc.tar.gz",
-			"dest": "{{var_hedgedoc_directory | dirname}}",
-			"owner": "{{var_hedgedoc_user_name}}"
+			"dest": "{{cfg_hedgedoc.directory | dirname}}",
+			"owner": "{{cfg_hedgedoc.user_name}}"
 		}
 	},
 	{
@ -54,7 +86,7 @@
 		"become": true,
 		"become_user": "hedgedoc",
 		"ansible.builtin.command": {
-			"chdir": "{{var_hedgedoc_directory}}",
+			"chdir": "{{cfg_hedgedoc.directory}}",
 			"cmd": "bin/setup"
 		}
 	},
@ -63,7 +95,7 @@
 		"become": true,
 		"ansible.builtin.template": {
 			"src": "config.json.j2",
-			"dest": "{{var_hedgedoc_directory}}/config.json"
+			"dest": "{{cfg_hedgedoc.directory}}/config.json"
 		}
 	},
 	{
--- a/roles/hedgedoc/templates/config.json.j2
+++ b/roles/hedgedoc/templates/config.json.j2
@ -1,61 +1,61 @@
 {
 	"production": {
-		"loglevel": "error",
-{% if var_hedgedoc_database_kind == 'sqlite' %}
+		"loglevel": "{{cfg_hedgedoc.log_level}}",
+{% if cfg_hedgedoc.database.kind == 'sqlite' %}
 		"db": {
 			"dialect": "sqlite",
-			"storage": "{{var_hedgedoc_database_data_sqlite_path}}"
+			"storage": "{{cfg_hedgedoc.database.data.sqlite.path}}"
 		},
 {% endif %}
-{% if var_hedgedoc_database_kind == 'postgresql' %}
+{% if cfg_hedgedoc.database.kind == 'postgresql' %}
 		"db": {
 			"dialect": "postgres",
-			"host": "{{var_hedgedoc_database_data_postgresql_host}}",
-			"port": {{var_hedgedoc_database_data_postgresql_port | to_json}},
-			"username": "{{var_hedgedoc_database_data_postgresql_username}}",
-			"password": "{{var_hedgedoc_database_data_postgresql_password}}",
-			"database": "{{var_hedgedoc_database_data_postgresql_schema}}"
+			"host": "{{cfg_hedgedoc.database.data.postgresql.host}}",
+			"port": {{cfg_hedgedoc.database.data.postgresql.port | to_json}},
+			"username": "{{cfg_hedgedoc.database.data.postgresql.username}}",
+			"password": "{{cfg_hedgedoc.database.data.postgresql.password}}",
+			"database": "{{cfg_hedgedoc.database.data.postgresql.schema}}"
 		},
 {% endif %}
-		"sessionSecret": "{{var_hedgedoc_session_secret}}",
+		"sessionSecret": "{{cfg_hedgedoc.session_secret}}",
 		"host": "localhost",
 		"allowOrigin": [
 			"localhost"
 		],
-		"domain": "{{var_hedgedoc_domain}}",
+		"domain": "{{cfg_hedgedoc.domain}}",
 		"urlAddPort": false,
 		"protocolUseSSL": true,
-{% if var_hedgedoc_authentication_kind == 'internal' %}
+{% if cfg_hedgedoc.authentication.kind == 'internal' %}
 		"email": true,
 		"allowEmailRegister": true,
 {% endif %}
-{% if var_hedgedoc_authentication_kind == 'authelia' %}
+{% if cfg_hedgedoc.authentication.kind == 'authelia' %}
 		"oauth2": {
-			"providerName": "{{var_hedgedoc_authentication_data_authelia_provider_name}}",
-			"clientID": "{{var_hedgedoc_authentication_data_authelia_client_id}}",
-			"clientSecret": "{{var_hedgedoc_authentication_data_authelia_client_secret}}",
+			"providerName": "{{cfg_hedgedoc.authentication.data.authelia.provider_name}}",
+			"clientID": "{{cfg_hedgedoc.authentication.data.authelia.client_id}}",
+			"clientSecret": "{{cfg_hedgedoc.authentication.data.authelia.client_secret}}",
 			"scope": "openid email profile",
 			"userProfileUsernameAttr": "sub",
 			"userProfileDisplayNameAttr": "name",
 			"userProfileEmailAttr": "email",
-			"userProfileURL": "{{var_hedgedoc_authentication_data_authelia_url_base}}/api/oidc/userinfo",
-			"tokenURL": "{{var_hedgedoc_authentication_data_authelia_url_base}}/api/oidc/token",
-			"authorizationURL": "{{var_hedgedoc_authentication_data_authelia_url_base}}/api/oidc/authorize"
+			"userProfileURL": "{{cfg_hedgedoc.authentication.data.authelia.url_base}}/api/oidc/userinfo",
+			"tokenURL": "{{cfg_hedgedoc.authentication.data.authelia.url_base}}/api/oidc/token",
+			"authorizationURL": "{{cfg_hedgedoc.authentication.data.authelia.url_base}}/api/oidc/authorization"
 		},
 		"email": false,
 		"allowEmailRegister": false,
 {% endif %}
-		"allowAnonymous": {{var_hedgedoc_guest_allow_create | to_json}},
-		"allowAnonymousEdits": {{var_hedgedoc_guest_allow_change | to_json}},
-{% if var_hedgedoc_free_names_mode == 'never' %}
+		"allowAnonymous": {{cfg_hedgedoc.guest_allow_create | to_json}},
+		"allowAnonymousEdits": {{cfg_hedgedoc.guest_allow_change | to_json}},
+{% if cfg_hedgedoc.free_names_mode == 'never' %}
 		"allowFreeURL": false,
 		"requireFreeURLAuthentication": false,
 {% endif %}
-{% if var_hedgedoc_free_names_mode == 'authed' %}
+{% if cfg_hedgedoc.free_names_mode == 'authed' %}
 		"allowFreeURL": true,
 		"requireFreeURLAuthentication": true,
 {% endif %}
-{% if var_hedgedoc_free_names_mode == 'always' %}
+{% if cfg_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={{var_hedgedoc_directory}}
-User={{var_hedgedoc_user_name}}
+WorkingDirectory={{cfg_hedgedoc.directory}}
+User={{cfg_hedgedoc.user_name}}
 Environment="NODE_ENV=production"
 ExecStart=yarn start
 SyslogIdentifier=hedgedoc
--- a/roles/hedgedoc/vardef.json
+++ b/roles/hedgedoc/vardef.json
@ -1,87 +0,0 @@
-{
-	"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/nginx/cfg.schema.json
+++ b/roles/nginx/cfg.schema.json
@ -0,0 +1,28 @@
+{
+	"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,3 +1,7 @@
 {
-	"var_nginx_auto_reload_interval": null
+	"cfg_nginx_defaults": {
+		"auto_reload_interval": null,
+		"dhparam_size": null,
+		"improved_security": false
+	}
 }
--- a/roles/nginx/tasks/main.json
+++ b/roles/nginx/tasks/main.json
@ -1,4 +1,11 @@
 [
+	{
+		"name": "show vars",
+		"when": "switch_show_vars",
+		"ansible.builtin.debug": {
+			"var": "vars.cfg_nginx"
+		}
+	},
 	{
 		"name": "install packages",
 		"become": true,
@ -12,9 +19,10 @@
 	},
 	{
 		"name": "generate dhparams file",
+		"when": "cfg_nginx.dhparam_size != None",
 		"become": true,
 		"ansible.builtin.command": {
-			"cmd": "openssl dhparam -out /etc/nginx/dhparam 4096"
+			"cmd": "openssl dhparam -out /etc/nginx/dhparam {{cfg_nginx.dhparam_size | string}}"
 		},
 		"args": {
 			"creates": "/etc/nginx/dhparam"
@ -23,13 +31,16 @@
 	{
 		"name": "place hardening config",
 		"become": true,
-		"ansible.builtin.copy": {
-			"src": "ssl-hardening.conf",
+		"ansible.builtin.template": {
+			"src": "ssl-hardening.conf.j2",
 			"dest": "/etc/nginx/ssl-hardening.conf"
 		}
 	},
 	{
-		"name": "ufw | check",
+		"name": "ufw",
+		"block": [
+			{
+				"name": "check",
 				"become": true,
 				"check_mode": true,
 				"community.general.ufw": {
@ -38,7 +49,7 @@
 				"register": "ufw_enable_check"
 			},
 			{
-		"name": "ufw | allow port 80",
+				"name": "allow port 80",
 				"when": "not ufw_enable_check.changed",
 				"become": true,
 				"community.general.ufw": {
@ -48,7 +59,7 @@
 				}
 			},
 			{
-		"name": "ufw | allow port 443",
+				"name": "allow port 443",
 				"when": "not ufw_enable_check.changed",
 				"become": true,
 				"community.general.ufw": {
@ -56,16 +67,18 @@
 					"port": "443",
 					"proto": "tcp"
 				}
+			}
+		]
 	},
 	{
 		"name": "auto reload",
-		"when": "var_nginx_auto_reload_interval == None",
+		"when": "cfg_nginx.auto_reload_interval == None",
 		"become": true,
 		"ansible.builtin.cron": {
 			"name": "nginx_auto_reload",
 			"disabled": true,
 			"minute": "0",
-			"hour": "*/{{var_nginx_auto_reload_interval | string}}",
+			"hour": "*/{{cfg_nginx.auto_reload_interval | string}}",
 			"day": "*",
 			"month": "*",
 			"weekday": "*",
@ -74,13 +87,13 @@
 	},
 	{
 		"name": "auto reload",
-		"when": "var_nginx_auto_reload_interval != None",
+		"when": "cfg_nginx.auto_reload_interval != None",
 		"become": true,
 		"ansible.builtin.cron": {
 			"name": "nginx_auto_reload",
 			"disabled": false,
 			"minute": "0",
-			"hour": "*/{{var_nginx_auto_reload_interval | string}}",
+			"hour": "*/{{cfg_nginx.auto_reload_interval | string}}",
 			"day": "*",
 			"month": "*",
 			"weekday": "*",
--- a/roles/nginx/templates/ssl-hardening.conf.j2
+++ b/roles/nginx/templates/ssl-hardening.conf.j2
@ -3,7 +3,9 @@ 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/vardef.json
+++ b/roles/nginx/vardef.json
@ -1,8 +0,0 @@
-{
-	"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
@ -0,0 +1,31 @@
+{
+	"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,5 +1,6 @@
 {
-	"var_owncloud_and_nginx_domain": "owncloud.example.org",
-	"var_owncloud_and_nginx_tls_mode": "force",
-	"var_owncloud_and_nginx_maximum_upload_size": "1G"
+	"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,4 +1,11 @@
 [
+	{
+		"name": "show vars",
+		"when": "switch_show_vars",
+		"ansible.builtin.debug": {
+			"var": "vars.cfg_owncloud_and_nginx"
+		}
+	},
 	{
 		"name": "deactivate default site",
 		"become": true,
@ -12,7 +19,7 @@
 		"become": true,
 		"ansible.builtin.template": {
 			"src": "conf.j2",
-			"dest": "/etc/nginx/sites-available/{{var_owncloud_and_nginx_domain}}"
+			"dest": "/etc/nginx/sites-available/{{cfg_owncloud_and_nginx.domain}}"
 		}
 	},
 	{
@ -20,8 +27,8 @@
 		"become": true,
 		"ansible.builtin.file": {
 			"state": "link",
-			"src": "/etc/nginx/sites-available/{{var_owncloud_and_nginx_domain}}",
-			"dest": "/etc/nginx/sites-enabled/{{var_owncloud_and_nginx_domain}}"
+			"src": "/etc/nginx/sites-available/{{cfg_owncloud_and_nginx.domain}}",
+			"dest": "/etc/nginx/sites-enabled/{{cfg_owncloud_and_nginx.domain}}"
 		}
 	},
 	{
--- a/roles/owncloud-and-nginx/templates/conf.j2
+++ b/roles/owncloud-and-nginx/templates/conf.j2
@ -1,7 +1,7 @@
 {% macro owncloud_common() %}
 	location / {
 		proxy_pass http://localhost:9200;
-		client_max_body_size {{var_owncloud_and_nginx_maximum_upload_size}};
+		client_max_body_size {{cfg_owncloud_and_nginx.maximum_upload_size}};
 	}
 {% endmacro %}

@ -9,24 +9,24 @@ server {
 	listen 80;
 	listen [::]:80;
 	
-	server_name {{var_owncloud_and_nginx_domain}};
+	server_name {{cfg_owncloud_and_nginx.domain}};
 	
-{% if var_owncloud_and_nginx_tls_mode == 'force' %}
+{% if cfg_owncloud_and_nginx.tls_mode == 'force' %}
 	return 301 https://$http_host$request_uri;
 {% else %}
 	{{ owncloud_common() }}
 {% endif %}
 }

-{% if var_owncloud_and_nginx_tls_mode != 'disable' %}
+{% if cfg_owncloud_and_nginx.tls_mode != 'disable' %}
 server {
 	listen 443 ssl;
 	listen [::]:443 ssl;
 	
-	server_name {{var_owncloud_and_nginx_domain}};
+	server_name {{cfg_owncloud_and_nginx.domain}};
 	
-	ssl_certificate_key /etc/ssl/private/{{var_owncloud_and_nginx_domain}}.pem;
-	ssl_certificate /etc/ssl/fullchains/{{var_owncloud_and_nginx_domain}}.pem;
+	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() }}
--- a/roles/owncloud-and-nginx/vardef.json
+++ b/roles/owncloud-and-nginx/vardef.json
@ -1,20 +0,0 @@
-
-{
-	"domain": {
-		"type": "string",
-		"mandatory": false
-	},
-	"tls_mode": {
-        "type": "string",
-        "options": [
-			"disable",
-			"enable",
-			"force"
-        ],
-        "mandatory": false
-	},
-	"maximum_upload_size": {
-		"type": "string",
-		"mandatory": false
-	}
-}
--- a/roles/owncloud/cfg.schema.json
+++ b/roles/owncloud/cfg.schema.json
@ -0,0 +1,152 @@
+{
+	"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,18 +1,16 @@
 {
-	"var_owncloud_user": "owncloud",
-	"var_owncloud_directory": "/opt/owncloud",
-	"var_owncloud_version": "5.0.0",
-	"var_owncloud_platform": "linux-amd64",
-	"var_owncloud_domain": "owncloud.example.org",
-	"var_owncloud_admin_password": "REPLACE_ME",
-	"var_owncloud_authentication_kind": "internal",
-	"var_owncloud_authentication_data_authelia_url_base": "https://authelia.example.org",
-	"var_owncloud_authentication_data_authelia_web_client_id": "owncloud_web",
-	"var_owncloud_authentication_data_authelia_web_client_secret": "REPLACE_ME",
-	"var_owncloud_authentication_data_authelia_android_client_id": "owncloud_android",
-	"var_owncloud_authentication_data_authelia_android_client_secret": "REPLACE_ME",
-	"var_owncloud_authentication_data_authelia_ios_client_id": "owncloud_ios",
-	"var_owncloud_authentication_data_authelia_ios_client_secret": "REPLACE_ME",
-	"var_owncloud_public_share_password_necessity": "writable",
-	"var_owncloud_public_share_password_policy_active": true
+	"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
@ -7,13 +7,26 @@ Cloud-Plattform [ownCloud](https://owncloud.com/) (the rewrite in Go named "Infi

 - [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 | Service | Proxy](https://doc.owncloud.com/ocis/next/deployment/services/s-list/proxy.html)
+- [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,39 +1,70 @@
 [
+	{
+		"name": "show vars",
+		"when": "switch_show_vars",
+		"ansible.builtin.debug": {
+			"var": "vars.cfg_owncloud"
+		}
+	},
 	{
 		"name": "user",
 		"become": true,
 		"ansible.builtin.user": {
-			"name": "{{var_owncloud_user}}",
+			"name": "{{cfg_owncloud.user}}",
 			"create_home": true,
-			"home": "{{var_owncloud_directory}}"
+			"home": "{{cfg_owncloud.directory}}"
 		}
 	},
 	{
 		"name": "download",
 		"become": true,
-		"become_user": "{{var_owncloud_user}}",
+		"become_user": "{{cfg_owncloud.user}}",
 		"ansible.builtin.get_url": {
-			"url": "https://download.owncloud.com/ocis/ocis/stable/{{var_owncloud_version}}/ocis-{{var_owncloud_version}}-{{var_owncloud_platform}}",
-			"dest": "{{var_owncloud_directory}}/ocis",
+			"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": "{{var_owncloud_user}}",
+		"become_user": "{{cfg_owncloud.user}}",
 		"ansible.builtin.shell": {
-			"chdir": "{{var_owncloud_directory}}",
-			"cmd": "rm -f {{var_owncloud_directory}}/.ocis/config/ocis.yaml && ./ocis init --insecure no --admin-password={{var_owncloud_admin_password}}"
-		}
-	},
-	{
-		"name": "configuration",
-		"become": true,
-		"become_user": "{{var_owncloud_user}}",
-		"ansible.builtin.template": {
-			"src": "env.j2",
-			"dest": "{{var_owncloud_directory}}/.env"
+			"chdir": "{{cfg_owncloud.directory}}",
+			"cmd": "./ocis init --insecure no --admin-password={{cfg_owncloud.admin_password}}"
 		}
 	},
 	{
--- a/roles/owncloud/templates/csp.yaml.j2
+++ b/roles/owncloud/templates/csp.yaml.j2
@ -0,0 +1,7 @@
+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,44 +1,62 @@
-OCIS_URL="https://{{var_owncloud_domain}}"
-OCIS_INSECURE="false"
-
-PROXY_TLS="false"
-
-{% if var_owncloud_authentication_kind == 'internal' %}
-PROXY_AUTOPROVISION_ACCOUNTS="false"
+## 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 %}

-{% if var_owncloud_authentication_kind == 'authelia' %}
-OCIS_OIDC_CLIENT_ID="{{var_owncloud_authentication_data_authelia_web_client_id}}"
-OCIS_OIDC_ISSUER="{{var_owncloud_authentication_data_authelia_url_base}}"
-
-PROXY_AUTOPROVISION_ACCOUNTS="true"
-PROXY_OIDC_REWRITE_WELLKNOWN="true"
-PROXY_OIDC_ACCESS_TOKEN_VERIFY_METHOD="none"
-PROXY_OIDC_INSECURE="false"
-PROXY_USER_OIDC_CLAIM="name"
-PROXY_USER_CS3_CLAIM="username"
-
-WEB_OIDC_AUTHORITY="{{var_owncloud_authentication_data_authelia_url_base}}"
-WEB_OIDC_METADATA_URL="{{var_owncloud_authentication_data_authelia_url_base}}/.well-known/openid-configuration"
-WEB_OIDC_CLIENT_ID="{{var_owncloud_authentication_data_authelia_web_client_id}}"
-WEB_OIDC_SCOPE="openid profile email groups"
+## 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 %}

-{% if var_owncloud_public_share_password_necessity == 'nothing' %}
-OCIS_SHARING_PUBLIC_SHARE_MUST_HAVE_PASSWORD="false"
-OCIS_SHARING_PUBLIC_WRITEABLE_SHARE_MUST_HAVE_PASSWORD="false"
+## 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 var_owncloud_public_share_password_necessity == 'writable' %}
-OCIS_SHARING_PUBLIC_SHARE_MUST_HAVE_PASSWORD="false"
-OCIS_SHARING_PUBLIC_WRITEABLE_SHARE_MUST_HAVE_PASSWORD="true"
+{% 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 var_owncloud_public_share_password_necessity == 'all' %}
-OCIS_SHARING_PUBLIC_SHARE_MUST_HAVE_PASSWORD="true"
-OCIS_SHARING_PUBLIC_WRITEABLE_SHARE_MUST_HAVE_PASSWORD="true"
+{% 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 var_owncloud_public_share_password_policy_active %}
-OCIS_SHARING_PASSWORD_POLICY_DISABLED="false"
+{% if cfg_owncloud.public_share.password_policy_active %}
+OCIS_SHARING_PASSWORD_POLICY_DISABLED=false
 {% else %}
-OCIS_SHARING_PASSWORD_POLICY_DISABLED="true"
+OCIS_SHARING_PASSWORD_POLICY_DISABLED=true
 {% endif %}
+
--- a/roles/owncloud/templates/systemd_unit.j2
+++ b/roles/owncloud/templates/systemd_unit.j2
@ -3,12 +3,12 @@ Description=ownCloud
 After=network.target

 [Service]
-WorkingDirectory={{var_owncloud_directory}}
-EnvironmentFile={{var_owncloud_directory}}/.env
-ExecStart={{var_owncloud_directory}}/ocis server
+WorkingDirectory={{cfg_owncloud.directory}}
+EnvironmentFile={{cfg_owncloud.directory}}/.env
+ExecStart={{cfg_owncloud.directory}}/ocis server
 Type=simple
 Restart=always
-User={{var_owncloud_user}}
+User={{cfg_owncloud.user}}

 [Install]
 WantedBy=default.target
--- a/roles/owncloud/vardef.json
+++ b/roles/owncloud/vardef.json
@ -1,75 +0,0 @@
-{
-	"user": {
-		"type": "string",
-		"mandatory": false
-	},
-	"directory": {
-		"type": "string",
-		"mandatory": false
-	},
-	"version": {
-		"type": "string",
-		"mandatory": false
-	},
-	"platform": {
-		"type": "string",
-		"mandatory": false
-	},
-	"domain": {
-		"type": "string",
-		"mandatory": false
-	},
-	"admin_password": {
-		"type": "string",
-		"mandatory": true
-	},
-	"authentication_kind": {
-		"type": "string",
-		"mandatory": false,
-		"options": [
-			"internal",
-			"authelia"
-		]
-	},
-	"authentication_data_authelia_url_base": {
-		"type": "string",
-		"mandatory": false
-	},
-	"authentication_data_authelia_web_client_id": {
-		"type": "string",
-		"mandatory": false
-	},
-	"authentication_data_authelia_web_client_secret": {
-		"type": "string",
-		"mandatory": false
-	},
-	"authentication_data_authelia_android_client_id": {
-		"type": "string",
-		"mandatory": false
-	},
-	"authentication_data_authelia_android_client_secret": {
-		"type": "string",
-		"mandatory": false
-	},
-	"authentication_data_authelia_ios_client_id": {
-		"type": "string",
-		"mandatory": false
-	},
-	"authentication_data_authelia_ios_client_secret": {
-		"type": "string",
-		"mandatory": false
-	},
-	"public_share_password_necessity": {
-		"type": "string",
-		"mandatory": false,
-		"options": [
-			"nothing",
-			"writable",
-			"all"
-		]
-	},
-	"public_share_password_policy_active": {
-		"type": "boolean",
-		"mandatory": false
-	}
-}
--- 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",
-			"db": "{{var_postgresql_for_authelia_schema}}",
+			"login_db": "{{var_postgresql_for_authelia_schema}}",
 			"objs": "ALL_IN_SCHEMA",
 			"roles": "{{var_postgresql_for_authelia_username}}",
 			"privs": "ALL",
--- a/roles/postgresql-for-forgejo/tasks/main.json
+++ b/roles/postgresql-for-forgejo/tasks/main.json
@ -39,7 +39,7 @@
 		"become_user": "postgres",
 		"community.postgresql.postgresql_privs": {
 			"state": "present",
-			"db": "{{var_postgresql_for_forgejo_schema}}",
+			"login_db": "{{var_postgresql_for_forgejo_schema}}",
 			"objs": "ALL_IN_SCHEMA",
 			"roles": "{{var_postgresql_for_forgejo_username}}",
 			"privs": "ALL",
--- a/roles/postgresql-for-gitlab/tasks/main.json
+++ b/roles/postgresql-for-gitlab/tasks/main.json
@ -39,7 +39,7 @@
 		"become_user": "postgres",
 		"community.postgresql.postgresql_privs": {
 			"state": "present",
-			"db": "{{var_postgresql_for_gitlab_schema}}",
+			"login_db": "{{var_postgresql_for_gitlab_schema}}",
 			"objs": "ALL_IN_SCHEMA",
 			"roles": "{{var_postgresql_for_gitlab_username}}",
 			"privs": "ALL",
@ -57,7 +57,7 @@
 		],
 		"community.postgresql.postgresql_ext": {
 			"state": "present",
-			"db": "{{var_postgresql_for_gitlab_schema}}",
+			"login_db": "{{var_postgresql_for_gitlab_schema}}",
 			"name": "{{item}}"
 		}
 	}
--- a/roles/postgresql-for-hedgedoc/tasks/main.json
+++ b/roles/postgresql-for-hedgedoc/tasks/main.json
@ -39,7 +39,7 @@
 		"become_user": "postgres",
 		"community.postgresql.postgresql_privs": {
 			"state": "present",
-			"db": "{{var_postgresql_for_hedgedoc_schema}}",
+			"login_db": "{{var_postgresql_for_hedgedoc_schema}}",
 			"objs": "ALL_IN_SCHEMA",
 			"roles": "{{var_postgresql_for_hedgedoc_username}}",
 			"privs": "ALL",
--- a/roles/postgresql-for-synapse/tasks/main.json
+++ b/roles/postgresql-for-synapse/tasks/main.json
@ -43,7 +43,7 @@
 		"become_user": "postgres",
 		"community.postgresql.postgresql_privs": {
 			"state": "present",
-			"db": "{{var_postgresql_for_synapse_schema}}",
+			"login_db": "{{var_postgresql_for_synapse_schema}}",
 			"objs": "ALL_IN_SCHEMA",
 			"roles": "{{var_postgresql_for_synapse_username}}",
 			"privs": "ALL",
--- a/roles/postgresql-for-tandoor/defaults/main.json
+++ b/roles/postgresql-for-tandoor/defaults/main.json
@ -0,0 +1,5 @@
+{
+	"var_postgresql_for_tandoor_username": "tandoor_user",
+	"var_postgresql_for_tandoor_password": "REPLACE_ME",
+	"var_postgresql_for_tandoor_schema": "tandoor"
+}
--- a/roles/postgresql-for-tandoor/tasks/main.json
+++ b/roles/postgresql-for-tandoor/tasks/main.json
@ -0,0 +1,50 @@
+[
+	{
+		"name": "packages",
+		"become": true,
+		"ansible.builtin.apt": {
+			"update_cache": true,
+			"pkg": [
+				"acl",
+				"python3-psycopg2",
+				"libpq-dev"
+			]
+		}
+	},
+	{
+		"name": "user",
+		"become": true,
+		"become_user": "postgres",
+		"community.postgresql.postgresql_user": {
+			"state": "present",
+			"name": "{{var_postgresql_for_tandoor_username}}",
+			"password": "{{var_postgresql_for_tandoor_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_tandoor_schema}}",
+			"owner": "{{var_postgresql_for_tandoor_username}}"
+		}
+	},
+	{
+		"name": "rights",
+		"become": true,
+		"become_user": "postgres",
+		"community.postgresql.postgresql_privs": {
+			"state": "present",
+			"login_db": "{{var_postgresql_for_tandoor_schema}}",
+			"objs": "ALL_IN_SCHEMA",
+			"roles": "{{var_postgresql_for_tandoor_username}}",
+			"privs": "ALL",
+			"grant_option": true
+		}
+	}
+]
--- a/roles/postgresql-for-vikunja/tasks/main.json
+++ b/roles/postgresql-for-vikunja/tasks/main.json
@ -39,7 +39,7 @@
 		"become_user": "postgres",
 		"community.postgresql.postgresql_privs": {
 			"state": "present",
-			"db": "{{var_postgresql_for_vikunja_schema}}",
+			"login_db": "{{var_postgresql_for_vikunja_schema}}",
 			"objs": "ALL_IN_SCHEMA",
 			"roles": "{{var_postgresql_for_vikunja_username}}",
 			"privs": "ALL",
--- a/roles/postgresql-for-wiki_js/tasks/main.json
+++ b/roles/postgresql-for-wiki_js/tasks/main.json
@ -39,7 +39,7 @@
 		"become_user": "postgres",
 		"community.postgresql.postgresql_privs": {
 			"state": "present",
-			"db": "{{var_postgresql_for_wiki_js_schema}}",
+			"login_db": "{{var_postgresql_for_wiki_js_schema}}",
 			"objs": "ALL_IN_SCHEMA",
 			"roles": "{{var_postgresql_for_wiki_js_username}}",
 			"privs": "ALL",
--- a/roles/sqlite-for-hedgedoc/defaults/main.json
+++ b/roles/sqlite-for-hedgedoc/defaults/main.json
@ -1,4 +0,0 @@
-{
-	"var_sqlite_for_hedgedoc_path": "/var/hedgedoc/data.sqlite",
-	"var_sqlite_for_hedgedoc_user_name": "hedgedoc"
-}
--- a/roles/sqlite-for-hedgedoc/tasks/main.json
+++ b/roles/sqlite-for-hedgedoc/tasks/main.json
@ -1,20 +0,0 @@
-[
-	{
-		"name": "directory",
-		"become": true,
-		"ansible.builtin.file": {
-			"state": "directory",
-			"path": "{{var_sqlite_for_hedgedoc_path | dirname}}",
-			"owner": "{{var_hedgedoc_user_name}}"
-		}
-	},
-	{
-		"name": "file",
-		"become": true,
-		"ansible.builtin.file": {
-			"state": "touch",
-			"path": "{{var_sqlite_for_hedgedoc_path}}",
-			"owner": "{{var_sqlite_for_hedgedoc_user_name}}"
-		}
-	}
-]
--- a/roles/sqlite-for-hedgedoc/vardef.json
+++ b/roles/sqlite-for-hedgedoc/vardef.json
@ -1,10 +0,0 @@
-{
-	"path": {
-		"type": "string",
-		"mandatory": false
-	},
-	"user_name": {
-		"type": "string",
-		"mandatory": false
-	}
-}
--- a/roles/synapse/info.md
+++ b/roles/synapse/info.md
@ -1,11 +1,12 @@
 ## Beschreibung

-Zur Einrichtung des [matrix.org](https://matrix.org/)-Servers Synapse
+Zur Einrichtung des [matrix.org](https://matrix.org/)-Servers [Synapse](https://github.com/element-hq/synapse)


 ## Verweise

 - [ubuntuusers-Wiki-Eintrag](https://wiki.ubuntuusers.de/Matrix_synapse/)
- [GitHub-Repository](https://github.com/matrix-org/synapse)
- [Configuration Manual](https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html)
- [Dokumentation | PostgreSQL](https://matrix-org.github.io/synapse/latest/postgres.html#using-postgres)
+- [GitHub-Repository](https://github.com/element-hq/synapse)
+- [Debian-Paket](https://element-hq.github.io/synapse/latest/setup/installation.html#debianubuntu)
+- [Configuration Manual](https://element-hq.github.io/synapse/latest/usage/configuration/config_documentation.html)
+- [Dokumentation | PostgreSQL](https://element-hq.github.io/synapse/latest/postgres.html#using-postgres)
--- a/roles/synapse/tasks/main.json
+++ b/roles/synapse/tasks/main.json
@ -1,14 +1,40 @@
 [
 	{
-		"name": "invoke required repositories",
+		"name": "preparation | install packages",
 		"become": true,
-		"ansible.builtin.copy": {
-			"src": "sources-bullseye-backports.list",
-			"dest": "/etc/apt/sources.list.d/bullseye-backports-for-synapse.list"
+		"ansible.builtin.apt": {
+			"update_cache": true,
+			"pkg": [
+				"lsb-release",
+				"apt-transport-https"
+			]
 		}
 	},
 	{
-		"name": "prepare package installation | server-name",
+		"name": "preparation | get keyring",
+		"become": true,
+		"ansible.builtin.get_url": {
+			"url": "https://packages.matrix.org/debian/matrix-org-archive-keyring.gpg",
+			"dest": "/usr/share/keyrings/matrix-org-archive-keyring.gpg"
+		}
+	},
+	{
+		"name": "preparation | add source",
+		"become": true,
+		"ansible.builtin.shell": {
+			"cmd": "echo \"deb [signed-by=/usr/share/keyrings/matrix-org-archive-keyring.gpg] https://packages.matrix.org/debian/ $(lsb_release -cs) main\" > /etc/apt/sources.list.d/synapse.list",
+			"creates": "/etc/apt/sources.list.d/synapse.list"
+		}
+	},
+	{
+		"name": "preparation | update package information",
+		"become": true,
+		"ansible.builtin.apt": {
+			"update_cache": true
+		}
+	},
+	{
+		"name": "preparation | conf | server-name",
 		"become": true,
 		"ansible.builtin.debconf": {
 			"name": "matrix-synapse",
@ -18,7 +44,7 @@
 		}
 	},
 	{
-		"name": "prepare package installation | report-stats",
+		"name": "preparation | conf | report-stats",
 		"become": true,
 		"ansible.builtin.debconf": {
 			"name": "matrix-synapse",
@ -34,7 +60,7 @@
 			"update_cache": true,
 			"pkg": [
 				"python3-authlib",
-				"matrix-synapse"
+				"matrix-synapse-py3"
 			]
 		}
 	},
@ -87,10 +113,10 @@
 	},
 	{
 		"name": "setup admin user",
+		"when": "var_synapse_admin_user_define",
 		"become": true,
 		"ansible.builtin.shell": {
 			"cmd": "synapse_register_new_matrix_user --config=/etc/matrix-synapse/homeserver.yaml --admin --user={{var_synapse_admin_user_name}} --password={{var_synapse_admin_user_password}} || true"
-		},
-		"when": "var_synapse_admin_user_define"
+		}
 	}
 ]
--- a/roles/synapse/templates/homeserver.yaml.j2
+++ b/roles/synapse/templates/homeserver.yaml.j2
@ -124,6 +124,7 @@ oidc_providers:
        localpart_template: "{{"{{"}} user.preferred_username {{"}}"}}"
        display_name_template: "{{"{{"}} user.name {{"}}"}}"
        email_template: "{{"{{"}} user.email {{"}}"}}"
+    user_profile_method: "userinfo_endpoint"
 {% endif %}

 account_validity:
@ -139,10 +140,11 @@ trusted_third_party_id_servers:

 enable_metrics: false

-app_service_config_files:
+app_service_config_files: [
  # - "/opt/mautrix-telegram/python-venv/registration.yaml"
  # - "/opt/mautrix-signal/python-venv/registration.yaml"
  # - "/opt/matrix-irc-bridge/appservice-registration-irc.yaml"
+]

 expire_access_token: false

--- a/roles/tandoor-and-nginx/defaults/main.json
+++ b/roles/tandoor-and-nginx/defaults/main.json
@ -0,0 +1,5 @@
+{
+	"var_tandoor_and_nginx_domain": "tandoor.example.org",
+	"var_tandoor_and_nginx_tls_mode": "force",
+	"var_tandoor_and_nginx_directory": "/opt/tandoor"
+}
--- a/roles/tandoor-and-nginx/info.md
+++ b/roles/tandoor-and-nginx/info.md
@ -0,0 +1,4 @@
+## Verweise
+
+- [Tandoor-Dokumentation | nginx](https://docs.tandoor.dev/install/manual/#nginx)
+
--- a/roles/tandoor-and-nginx/tasks/main.json
+++ b/roles/tandoor-and-nginx/tasks/main.json
@ -0,0 +1,35 @@
+[
+	{
+		"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/{{var_tandoor_and_nginx_domain}}"
+		}
+	},
+	{
+		"name": "emplace configuration | link",
+		"become": true,
+		"ansible.builtin.file": {
+			"state": "link",
+			"src": "/etc/nginx/sites-available/{{var_tandoor_and_nginx_domain}}",
+			"dest": "/etc/nginx/sites-enabled/{{var_tandoor_and_nginx_domain}}"
+		}
+	},
+	{
+		"name": "restart nginx",
+		"become": true,
+		"ansible.builtin.systemd_service": {
+			"state": "restarted",
+			"name": "nginx"
+		}
+	}
+]
--- a/roles/tandoor-and-nginx/templates/conf.j2
+++ b/roles/tandoor-and-nginx/templates/conf.j2
@ -0,0 +1,43 @@
+{% macro tandoor_common() %}
+	location /static {
+		alias {{var_tandoor_and_nginx_directory}}/program/staticfiles;
+	}
+	
+	location /media {
+		alias {{var_tandoor_and_nginx_directory}}/program/mediafiles;
+	}
+	
+	location / {
+		proxy_set_header Host $http_host;
+		proxy_pass http://unix:{{var_tandoor_and_nginx_directory}}/program/recipes.sock;
+		proxy_set_header X-Forwarded-Proto $scheme;
+	}
+{% endmacro %}
+
+server {
+	listen 80;
+	listen [::]:80;
+	
+	server_name {{var_tandoor_and_nginx_domain}};
+	
+{% if var_tandoor_and_nginx_tls_mode == 'force' %}
+	return 301 https://$http_host$request_uri;
+{% else %}
+{{ tandoor_common() }}
+{% endif %}
+}
+
+{% if var_tandoor_and_nginx_tls_mode != 'disable' %}
+server {
+	listen 443 ssl;
+	listen [::]:443 ssl;
+	
+	server_name {{var_tandoor_and_nginx_domain}};
+	
+	ssl_certificate_key /etc/ssl/private/{{var_tandoor_and_nginx_domain}}.pem;
+	ssl_certificate /etc/ssl/fullchains/{{var_tandoor_and_nginx_domain}}.pem;
+	include /etc/nginx/ssl-hardening.conf;
+	
+{{ tandoor_common() }}
+}
+{% endif %}
--- a/roles/tandoor-and-nginx/vardef.json
+++ b/roles/tandoor-and-nginx/vardef.json
@ -0,0 +1,19 @@
+{
+	"domain": {
+		"mandatory": false,
+		"type": "string"
+	},
+	"port": {
+		"mandatory": false,
+		"type": "integer"
+	},
+	"tls_mode": {
+		"mandatory": false,
+		"type": "string",
+		"options": [
+			"disable",
+			"enable",
+			"force"
+		]
+	}
+}
--- a/roles/tandoor/defaults/main.json
+++ b/roles/tandoor/defaults/main.json
@ -0,0 +1,27 @@
+{
+	"var_tandoor_user": "tandoor",
+	"var_tandoor_directory": "/opt/tandoor",
+	"var_tandoor_repository_url": "https://github.com/vabene1111/recipes.git",
+	"var_tandoor_repository_reference": "master",
+	"var_tandoor_database_kind": "sqlite",
+	"var_tandoor_database_data_postgresql_host": "postgresql.example.org",
+	"var_tandoor_database_data_postgresql_port": 5432,
+	"var_tandoor_database_data_postgresql_username": "tandoor_user",
+	"var_tandoor_database_data_postgresql_password": "REPLACE_ME",
+	"var_tandoor_database_data_postgresql_schema": "tandoor",
+	"var_tandoor_authentication_kind": "internal",
+	"var_tandoor_authentication_data_authelia_client_id": "REPLACE_ME",
+	"var_tandoor_authentication_data_authelia_client_secret": "REPLACE_ME",
+	"var_tandoor_authentication_data_authelia_url_base": "https://authelia.example.org",
+	"var_tandoor_authentication_data_authelia_label": "Authelia",
+	"var_tandoor_smtp_host": "smtp.example.org",
+	"var_tandoor_smtp_port": 587,
+	"var_tandoor_smtp_username": "tandoor@smtp.example.org",
+	"var_tandoor_smtp_password": "REPLACE_ME",
+	"var_tandoor_notification_sender": "notification@tandoor.example.org",
+	"var_tandoor_secret_key": "REPLACE_ME",
+	"var_tandoor_admin_username": "admin",
+	"var_tandoor_admin_password": "REPLACE_ME",
+	"var_tandoor_admin_email": "admin@tandoor.example.org",
+	"var_tandoor_domain": "tandoor.exmaple.org"
+}
--- a/roles/tandoor/info.md
+++ b/roles/tandoor/info.md
@ -0,0 +1,24 @@
+## Beschreibung
+
+Für Rezepte-Sammlung [Tandoor](https://tandoor.dev/)
+
+
+## Verweise
+
+- [Tandoor-Dokumentation | Installation](https://docs.tandoor.dev/install/manual/)
+- [Tandoor-Dokumentation | Konfiguration](https://docs.tandoor.dev/system/configuration/)
+- [Tandoor-Dokumentation | Allauth](https://docs.tandoor.dev/features/authentication/#allauth)
+- [Django-Dokumentation | Variable `DJANGO_SUPERUSER_PASSWORD`](https://docs.djangoproject.com/en/5.1/ref/django-admin/#envvar-DJANGO_SUPERUSER_PASSWORD)
+- [allauth-Dokumentation | OpenID Connect](https://docs.allauth.org/en/latest/socialaccount/providers/openid_connect.html)
+- [allauth-Dokumentation | Authelia](https://docs.allauth.org/en/latest/socialaccount/providers/authelia.html)
+
+
+## ToDo
+
+- Idempotenz
+
+
+## Bugs
+
+- `usersessions_usersession.ip` darf nicht `NULL` sein, wird es aber; workaround: `ALTER TABLE usersessions_usersession ALTER COLUMN ip DROP NOT NULL;`
+- Verzeichnis `mediafiles` fehlt noch
--- a/roles/tandoor/tasks/main.json
+++ b/roles/tandoor/tasks/main.json
@ -0,0 +1,135 @@
+[
+	{
+		"name": "packages",
+		"become": true,
+		"ansible.builtin.apt": {
+			"update_cache": true,
+			"pkg": [
+				"git",
+				"gcc",
+				"libpq-dev",
+				"libldap2-dev",
+				"libsasl2-dev",
+				"python3-venv",
+				"python3-dev",
+				"nodejs",
+				"yarnpkg"
+			]
+		}
+	},
+	{
+		"name": "user and directory",
+		"become": true,
+		"ansible.builtin.user": {
+			"name": "{{var_tandoor_user}}",
+			"create_home": true,
+			"home": "{{var_tandoor_directory}}"
+		}
+	},
+	{
+		"name": "sources",
+		"become": true,
+		"become_user": "{{var_tandoor_user}}",
+		"ansible.builtin.git": {
+			"repo": "{{var_tandoor_repository_url}}",
+			"version": "{{var_tandoor_repository_reference}}",
+			"single_branch": true,
+			"dest": "{{var_tandoor_directory}}/program",
+			"force": true
+		}
+	},
+	{
+		"name": "venv",
+		"become": true,
+		"become_user": "{{var_tandoor_user}}",
+		"ansible.builtin.command": {
+			"chdir": "{{var_tandoor_directory}}",
+			"cmd": "python3 -m venv program"
+		}
+	},
+	{
+		"name": "configuration",
+		"become": true,
+		"become_user": "{{var_tandoor_user}}",
+		"ansible.builtin.template": {
+			"src": "conf.j2",
+			"dest": "{{var_tandoor_directory}}/program/.env",
+			"mode": "644"
+		}
+	},
+	{
+		"name": "python requirements",
+		"become": true,
+		"become_user": "{{var_tandoor_user}}",
+		"ansible.builtin.pip": {
+			"virtualenv": "{{var_tandoor_directory}}/program",
+			"virtualenv_python": "python3",
+			"requirements": "{{var_tandoor_directory}}/program/requirements.txt"
+		}
+	},
+	{
+		"name": "frontend stuff | core",
+		"become": true,
+		"become_user": "{{var_tandoor_user}}",
+		"ansible.builtin.shell": {
+			"chdir": "{{var_tandoor_directory}}/program/vue3",
+			"cmd": "yarn install && yarn build"
+		}
+	},
+	{
+		"name": "frontend stuff | link",
+		"become": true,
+		"become_user": "{{var_tandoor_user}}",
+		"ansible.builtin.file": {
+			"type": "link",
+			"src": "{{var_tandoor_directory}}/program/cookbook/static/vue3",
+			"dest": "{{var_tandoor_directory}}/program/staticfiles/vue3"
+		}
+	},
+	{
+		"name": "initialize",
+		"become": true,
+		"become_user": "{{var_tandoor_user}}",
+		"environment": {
+			"VIRTUAL_ENV": "{{var_tandoor_directory}}/program"
+		},
+		"loop": [
+			"migrate",
+			"collectstatic --no-input",
+			"collectstatic_js_reverse"
+		],
+		"ansible.builtin.shell": {
+			"chdir": "{{var_tandoor_directory}}/program",
+			"cmd": "bin/python3 manage.py {{item}}"
+		}
+	},
+	{
+		"name": "admin account",
+		"become": true,
+		"become_user": "{{var_tandoor_user}}",
+		"environment": {
+			"VIRTUAL_ENV": "{{var_tandoor_directory}}/program"
+		},
+		"ansible.builtin.shell": {
+			"chdir": "{{var_tandoor_directory}}/program",
+			"cmd": "DJANGO_SUPERUSER_PASSWORD={{var_tandoor_admin_password}} bin/python3 manage.py createsuperuser --no-input --username {{var_tandoor_admin_username}} --email {{var_tandoor_admin_email}}"
+		}
+	},
+	{
+		"name": "systemd unit",
+		"become": true,
+		"ansible.builtin.template": {
+			"src": "systemd-unit.j2",
+			"dest": "/etc/systemd/system/tandoor.service"
+		}
+	},
+	{
+		"name": "start",
+		"become": true,
+		"ansible.builtin.systemd_service": {
+			"enabled": true,
+			"state": "started",
+			"name": "tandoor"
+		}
+	}
+]
--- a/roles/tandoor/templates/conf.j2
+++ b/roles/tandoor/templates/conf.j2
@ -0,0 +1,41 @@
+{% if var_tandoor_database_kind == 'sqlite' %}
+DB_ENGINE=django.db.backends.sqlite3
+{% endif %}
+
+{% if var_tandoor_database_kind == 'postgresql' %}
+DB_ENGINE=django.db.backends.postgresql
+POSTGRES_HOST={{var_tandoor_database_data_postgresql_host}}
+POSTGRES_DB={{var_tandoor_database_data_postgresql_schema}}
+POSTGRES_PORT={{var_tandoor_database_data_postgresql_port | string}}
+POSTGRES_USER={{var_tandoor_database_data_postgresql_username}}
+POSTGRES_PASSWORD={{var_tandoor_database_data_postgresql_password}}
+{% endif %}
+
+{% if var_tandoor_authentication_kind == 'internal' %}
+ENABLE_SIGNUP=1
+REMOTE_USER_AUTH=0
+{% endif %}
+
+{% if var_tandoor_authentication_kind == 'authelia' %}
+ENABLE_SIGNUP=0
+REMOTE_USER_AUTH=1
+SOCIAL_PROVIDERS=allauth.socialaccount.providers.openid_connect
+SOCIALACCOUNT_PROVIDERS={"openid_connect": {"OAUTH_PKCE_ENABLED": true, "APPS": [{"provider_id": "authelia", "name": "{{var_tandoor_authentication_data_authelia_label}}", "client_id": "{{var_tandoor_authentication_data_authelia_client_id}}", "secret": "{{var_tandoor_authentication_data_authelia_client_secret}}", "settings": {"server_url": "{{var_tandoor_authentication_data_authelia_url_base}}/.well-known/openid-configuration", "token_auth_method": "client_secret_basic"}}]}}
+{% endif %}
+
+EMAIL_HOST={{var_tandoor_smtp_host}}
+EMAIL_PORT={{var_tandoor_smtp_port | string}}
+EMAIL_HOST_USER={{var_tandoor_smtp_username}}
+EMAIL_HOST_PASSWORD={{var_tandoor_smtp_password}}
+EMAIL_USE_TLS=1
+EMAIL_USE_SSL=0
+DEFAULT_FROM_EMAIL={{var_tandoor_notification_sender}}
+
+SECRET_KEY={{var_tandoor_secret_key}}
+
+ALLOWED_HOSTS={{var_tandoor_domain}}
+
+ENABLE_METRICS=0
+ENABLE_PDF_EXPORT=0
+
+DEBUG=0
--- a/roles/tandoor/templates/systemd-unit.j2
+++ b/roles/tandoor/templates/systemd-unit.j2
@ -0,0 +1,16 @@
+[Unit]
+Description=Tandoor (gunicorn daemon)
+After=network.target
+
+[Service]
+Type=simple
+Restart=always
+RestartSec=3
+User={{var_tandoor_user}}
+Group=www-data
+WorkingDirectory={{var_tandoor_directory}}/program
+EnvironmentFile={{var_tandoor_directory}}/program/.env
+ExecStart={{var_tandoor_directory}}/program/bin/gunicorn --capture-output --bind unix:{{var_tandoor_directory}}/program/recipes.sock recipes.wsgi:application
+
+[Install]
+WantedBy=multi-user.target
--- a/roles/tlscert_selfsigned/cfg.schema.json
+++ b/roles/tlscert_selfsigned/cfg.schema.json
@ -0,0 +1,14 @@
+{
+	"nullable": false,
+	"type": "object",
+	"properties": {
+		"domain": {
+			"nullable": false,
+			"type": "string"
+		}
+	},
+	"additionalProperties": false,
+	"required": [
+		"domain"
+	]
+}
--- a/roles/tlscert_selfsigned/defaults/main.json
+++ b/roles/tlscert_selfsigned/defaults/main.json
@ -1,3 +1,4 @@
 {
-	"var_tlscert_selfsigned_domain": "foo.example.org"
+	"cfg_tlscert_selfsigned_defaults": {
+	}
 }
--- a/roles/tlscert_selfsigned/tasks/main.json
+++ b/roles/tlscert_selfsigned/tasks/main.json
@ -1,4 +1,11 @@
 [
+	{
+		"name": "show vars",
+		"when": "switch_show_vars",
+		"ansible.builtin.debug": {
+			"var": "vars.cfg_tlscert_selfsigned"
+		}
+	},
 	{
 		"name": "install packages",
 		"become": true,
@ -28,19 +35,19 @@
 		"name": "csr | generate private key",
 		"become": true,
 		"community.crypto.openssl_privatekey": {
-			"path": "/etc/ssl/private/{{var_tlscert_selfsigned_domain}}.pem"
+			"path": "/etc/ssl/private/{{cfg_tlscert_selfsigned.domain}}.pem"
 		}
 	},
 	{
 		"name": "csr | execute",
 		"become": true,
 		"community.crypto.openssl_csr": {
-			"privatekey_path": "/etc/ssl/private/{{var_tlscert_selfsigned_domain}}.pem",
-			"common_name": "{{var_tlscert_selfsigned_domain}}",
+			"privatekey_path": "/etc/ssl/private/{{cfg_tlscert_selfsigned.domain}}.pem",
+			"common_name": "{{cfg_tlscert_selfsigned.domain}}",
 			"subject_alt_name": [
-				"DNS:{{var_tlscert_selfsigned_domain}}"
+				"DNS:{{cfg_tlscert_selfsigned.domain}}"
 			],
-			"path": "/etc/ssl/csr/{{var_tlscert_selfsigned_domain}}.pem"
+			"path": "/etc/ssl/csr/{{cfg_tlscert_selfsigned.domain}}.pem"
 		},
 		"register": "temp_csr"
 	},
@ -48,17 +55,17 @@
 		"name": "generate certificate",
 		"become": true,
 		"community.crypto.x509_certificate": {
-			"privatekey_path": "/etc/ssl/private/{{var_tlscert_selfsigned_domain}}.pem",
-			"csr_path": "/etc/ssl/csr/{{var_tlscert_selfsigned_domain}}.pem",
+			"privatekey_path": "/etc/ssl/private/{{cfg_tlscert_selfsigned.domain}}.pem",
+			"csr_path": "/etc/ssl/csr/{{cfg_tlscert_selfsigned.domain}}.pem",
 			"provider": "selfsigned",
-			"path": "/etc/ssl/certs/{{var_tlscert_selfsigned_domain}}.pem"
+			"path": "/etc/ssl/certs/{{cfg_tlscert_selfsigned.domain}}.pem"
 		}
 	},
 	{
 		"name": "compose fullchain",
 		"become": true,
 		"ansible.builtin.shell": {
-			"cmd": "cat /etc/ssl/certs/{{var_tlscert_selfsigned_domain}}.pem > /etc/ssl/fullchains/{{var_tlscert_selfsigned_domain}}.pem"
+			"cmd": "cat /etc/ssl/certs/{{cfg_tlscert_selfsigned.domain}}.pem > /etc/ssl/fullchains/{{cfg_tlscert_selfsigned.domain}}.pem"
 		}
 	}
 ]
--- a/roles/wiki_js/files/wiki-js-cli
+++ b/roles/wiki_js/files/wiki-js-cli
@ -288,7 +288,7 @@ var _wiki_js_cli;
         */
        async function call_finalize(admin_email, admin_password, site_url, telemetry) {
            const http_request = {
-                "target": (_wiki_js_cli.conf.get().api.url_base + "/finalize"),
+                "target": (_url_base + "/finalize"),
                "method": "POST",
                "headers": {
                    "Content-Type": "application/json",
--- a/roles/wiki_js/tasks/main.json
+++ b/roles/wiki_js/tasks/main.json
@ -55,7 +55,8 @@
 		"ansible.builtin.copy": {
 			"src": "wiki-js-cli",
 			"dest": "/usr/local/bin/wiki-js-cli",
-			"mode": "0700"
+			"owner": "{{var_wiki_js_user}}",
+			"mode": "0770"
 		}
 	},
 	{
@ -129,7 +130,7 @@
 		"become_user": "{{var_wiki_js_user}}",
 		"ansible.builtin.command": {
 			"chdir": "{{var_wiki_js_directory}}",
-			"cmd": "/usr/local/bin/wiki-js-cli -b http://127.0.0.1:{{var_wiki_js_port | string}} -u {{var_wiki_js_admin_email_address}} -p {{var_wiki_js_admin_password}} email-settings-set {{var_wiki_js_smtp_host}} {{var_wiki_js_smtp_port}} {{var_wiki_js_smtp_username}} {{var_wiki_js_smtp_password}} {{email_sending_sender_name}} {{email_sending_sender_email_address}}"
+			"cmd": "/usr/local/bin/wiki-js-cli -b http://127.0.0.1:{{var_wiki_js_port | string}} -u {{var_wiki_js_admin_email_address}} -p {{var_wiki_js_admin_password}} email-settings-set {{var_wiki_js_smtp_host}} {{var_wiki_js_smtp_port}} {{var_wiki_js_smtp_username}} {{var_wiki_js_smtp_password}} {{var_wiki_js_email_sending_sender_name}} {{var_wiki_js_email_sending_sender_email_address}}"
 		}
 	},
 	{
--- a/Show more
+++ b/Show more
Author	SHA1	Message	Date
Christian Fraß	f647e15aee	[task-393]	2025-10-23 23:41:31 +02:00
Christian Fraß	53b88c896f	[task-410]	2025-10-15 08:10:38 +02:00
fenris	4bb1c0d1be	[del] role:sqlite-for-hedgedoc	2025-10-09 01:49:33 +02:00
fenris	c2e100b1aa	[task-406] owncloud	2025-10-09 01:49:09 +02:00
fenris	6294edaa59	[task-406] nginx	2025-10-09 01:47:49 +02:00
fenris	88a65ad919	[task-406] hedgedoc	2025-10-09 01:47:20 +02:00
fenris	5b283c7804	[task-406] nginx	2025-10-09 01:45:37 +02:00
fenris	df9f32ad02	[task-406] hedgedoc	2025-10-09 01:45:22 +02:00
fenris	59510fb415	[task-406] nginx	2025-10-09 01:44:12 +02:00
fenris	e0f485e556	[task-406] authelia	2025-10-09 01:43:49 +02:00
fenris	fb931da668	[task-406] nginx	2025-10-09 01:42:26 +02:00
fenris	5d1b1908a5	[task-406] tlscert_selfsigned	2025-10-09 01:41:40 +02:00
Christian Fraß	283b8d9863	[add] tool:cfg-man	2025-10-09 01:36:32 +02:00
Christian Fraß	03a84c0d6a	Revert "[int]" This reverts commit `ae35b71940`.	2025-10-07 14:38:48 +02:00
Christian Fraß	ae35b71940	[int]	2025-10-07 14:35:48 +02:00
Christian Fraß	fc51133a78	[mod] galaxy definition	2025-09-26 00:19:49 +02:00
Christian Fraß	1cbc725793	[mod] galaxy definition	2025-09-26 00:18:28 +02:00
Christian Fraß	f63cdf2fb8	[mod] galaxy definition [mod] readme	2025-09-22 21:52:26 +02:00
Christian Fraß	eb00d988bb	[mod] role:tandoor:info	2025-09-17 23:40:06 +02:00
Christian Fraß	969a3187a9	[upd] role:tandoor	2025-09-17 23:39:02 +02:00
Christian Fraß	e4a5beddcc	[fix] role:hedgedoc:conf template:authorization url	2025-09-17 17:55:02 +02:00
Christian Fraß	32750c5335	[mod] tools:check:sorting	2025-09-17 15:38:01 +02:00
Christian Fraß	c17fb1d17e	[fix] authelia:Quellen eintragen	2025-09-17 15:37:02 +02:00
Christian Fraß	cb7ed44c61	[fix] role:synapse:conf template	2025-09-17 15:35:52 +02:00
Christian Fraß	71762b5208	[mod] role:synapse:info	2025-09-17 08:22:47 +00:00
Christian Fraß	fcffff701f	[fix] role:synapse:package sources	2025-09-17 08:14:17 +00:00
Christian Fraß	e4988f2f85	[fix] role:tandoor	2025-09-16 20:32:49 +02:00
Christian Fraß	aa12caf444	[fix] tandoor:auth	2025-08-27 22:08:55 +00:00
Christian Fraß	a70936f56d	[mod] forgejo:default:version	2025-04-22 17:12:45 +00:00
roydfalk	605737c675	Merge pull request 'Rolle \| Tandoor' (#6 ) from task-230-tandoor into main Reviewed-on: https://forgejo.linke.sx/misc/ansible-base/pulls/6	2025-01-12 10:07:19 +01:00
Christian Fraß	eaa5f24046	[task-230] [mod] kleine Anpassungen	2025-01-12 10:05:20 +01:00
Christian Fraß	59ea4e256c	[task-230] [fix] role:postgresql-for-tandoor	2025-01-11 15:49:53 +01:00
Christian Fraß	41ece50aa2	[task-230] [fix] role:postgresql-for-tandoor	2025-01-11 15:47:48 +01:00
Christian Fraß	9a86117869	[task-230] [fix] role:postgresql-for-tandoor	2025-01-11 15:45:08 +01:00
Christian Fraß	5a7f10561c	[task-230] [fix] tandoor: authelia	2025-01-08 22:56:02 +01:00
Christian Fraß	52c675f6e3	[task-230] [add] authelia-for-tandoor	2025-01-08 22:00:01 +01:00
Christian Fraß	f426927df1	[task-230] [mod] tandoor: admin user and auth stuff	2025-01-08 21:59:45 +01:00
Christian Fraß	46a1a98751	[task-230] [fix] tandoor stuff	2025-01-08 20:10:56 +01:00
Christian Fraß	6ce4717a45	[taks-230] [fix] tandoor: systemd-unit-Zeilen	2024-12-31 14:21:14 +01:00
Christian Fraß	173d7790f6	[taks-230] [fix] tandoor: systemd-unit-Einsatz	2024-12-31 13:56:40 +01:00
Christian Fraß	2971154dba	[taks-230] [fix] tandoor: git-Aufruf	2024-12-31 13:40:26 +01:00
Christian Fraß	e740be07f4	[taks-230] [fix] tandoor: Daten nur holen, falls noch nicht da	2024-12-31 13:37:47 +01:00
Christian Fraß	f80e6ee661	[task-230] [mod] tandoor: Befehle in Schleife zusammengefasst [fix] yarn-Befehl korrigiert	2024-12-31 13:34:24 +01:00
Christian Fraß	43c35f0620	[task-230] [mod] tandoor: richtiges Verzeichnis auswählen	2024-12-31 13:23:17 +01:00
Christian Fraß	8ab3117ba8	[task-230] [mod] tandoor: env-Variablen richtig setzen	2024-12-31 13:21:29 +01:00
Christian Fraß	9b473372db	[task-230] [mod] tandoor: Abhängigkeiten installieren	2024-12-31 13:17:26 +01:00
Christian Fraß	5d7019fdee	[task-230] [mod] become-Parameter ergänzt	2024-12-30 17:04:03 +01:00
Christian Fraß	a6a7460230	[task-230] [mod] tandoor: create venv	2024-12-30 17:02:04 +01:00
Christian Fraß	5a1eb1a764	[task-230] [mod] tandoor: fix pip install	2024-12-30 15:09:22 +01:00
Christian Fraß	b2a6c20c94	[task-230] [mod] tandoor: fix pip install	2024-12-30 14:59:39 +01:00
Christian Fraß	4319326513	[task-230] [mod] install path	2024-12-30 14:55:58 +01:00
Christian Fraß	bacbc78b2e	[add] tandoor-and-nginx	2024-12-30 13:35:31 +01:00
Christian Fraß	83fcb5aca2	[add] tandoor	2024-12-30 13:35:21 +01:00
Christian Fraß	5b9545010a	[add] postgresql-for-tandoor	2024-12-30 13:35:11 +01:00
roydfalk	45cd387e99	Merge pull request 'Authelia \| scopes richten' (#5 ) from task-187 into main Reviewed-on: https://forgejo.linke.sx/misc/ansible-base/pulls/5	2024-10-26 13:43:32 +02:00
Christian Fraß	9002fc9604	[task-187] [mod] authelia-for-hedgedoc:"grant_types" entfernt	2024-10-26 12:15:12 +02:00
roydfalk	62b4aac895	Merge pull request 'Authelia \| response types richten' (#4 ) from task-186 into main Reviewed-on: https://forgejo.linke.sx/misc/ansible-base/pulls/4	2024-10-26 12:13:47 +02:00
roydfalk	9da7a88358	Merge pull request 'Authelia \| client-secrets hashen' (#3 ) from dev-authelia_hashed_client_secrets into main Reviewed-on: https://forgejo.linke.sx/misc/ansible-base/pulls/3	2024-10-26 12:10:57 +02:00
Christian Fraß	f2766fcf43	[task-183] [mod] authelia-for-owncloud	2024-10-26 11:54:25 +02:00
Christian Fraß	cef1c0aeda	[task-186] [mod] authelia-for-owncloud:"response_types" zu conf-Vorlagen hinzugefügt	2024-10-26 11:45:47 +02:00
Christian Fraß	b14b80b129	[task-184] [mod] authelia:conf template	2024-10-26 11:13:05 +02:00
Christian Fraß	cd31cdea2e	[task-185] [mod] authelia:conf template	2024-10-26 11:06:20 +02:00
Christian Fraß	4d4059f294	[task-184] [mod] authelia:conf template	2024-10-26 11:05:48 +02:00
Christian Fraß	d690a6454a	[task-183] [mod] authelia-for-vikunja	2024-10-26 10:33:41 +02:00
Christian Fraß	0eaf14609c	[task-183] [mod] authelia-for-synapse	2024-10-26 10:32:43 +02:00
Christian Fraß	50b5dd63e2	[task-183] [mod] authelia-for-owncloud	2024-10-26 10:31:15 +02:00
Christian Fraß	c54ef3281c	[task-183] [mod] authelia-for-hedgedoc	2024-10-26 10:25:00 +02:00
Christian Fraß	40fbc3d001	[task-183] [mod] authelia-for-gitlab	2024-10-26 10:23:55 +02:00
Christian Fraß	a9e1070d46	[task-183] [mod] authelia-for-forgejo	2024-10-26 10:23:40 +02:00
Christian Fraß	ff436ae67c	[task-183] [mod] authelia-for-dokuwiki	2024-10-26 10:20:55 +02:00
Christian Fraß	27ac5d7173	[task-183] [mod] authelia-for-wiki_js	2024-10-26 10:13:25 +02:00
Christian Fraß	05d1c0a8c1	[task-183] [mod] authelia-for-wiki_js	2024-10-26 10:10:47 +02:00
Christian Fraß	13561a2019	[task-183] [mod] authelia-for-wiki_js	2024-10-26 10:07:49 +02:00
Christian Fraß	09e667a34d	[task-183] [mod] authelia-for-wiki_js	2024-10-26 10:00:34 +02:00
Christian Fraß	6aa922a20a	[fix] role:wiki.js:file:cli client	2024-10-26 01:54:27 +02:00
Christian Fraß	30313bff2e	[fix] role:wiki.js	2024-10-26 01:13:25 +02:00
Christian Fraß	6378c0dd92	[fix] role:wiki.js	2024-10-26 01:08:52 +02:00
Christian Fraß	ef84185102	[fix] role:synapse:apt stuff	2024-10-25 10:16:13 +02:00
Christian Fraß	55d5c57cc2	[mod] hedgedoc:default:auth:changed to "internal"	2024-10-17 18:07:16 +02:00
Christian Fraß	6a1e9938f8	[mod] synapse:info	2024-10-13 13:16:00 +02:00