[task-393]

This reverts commit ae35b71940.

README.md

@@ -1,4 +1,4 @@
-# Ansible Collection - linke.standard
+# Ansible Collection - roydfalk.standard
 
 Sammlung von allgemeinen, wiederverwendbaren Ansible-Rollen
 

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'

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

roles/authelia-and-nginx/defaults/main.json

@@ -1,4 +1,5 @@
 {
-	"var_authelia_and_nginx_domain": "authelia.example.org",
+	"cfg_authelia_and_nginx_defaults": {
-	"var_authelia_and_nginx_tls_mode": "force"
+		"tls_mode": "force"
+	}
 }

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}}",
+			"src": "/etc/nginx/sites-available/{{cfg_authelia_and_nginx.domain}}",
-			"dest": "/etc/nginx/sites-enabled/{{var_authelia_and_nginx_domain}}"
+			"dest": "/etc/nginx/sites-enabled/{{cfg_authelia_and_nginx.domain}}"
 		}
 	},
 	{

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_key /etc/ssl/private/{{cfg_authelia_and_nginx.domain}}.pem;
-	ssl_certificate /etc/ssl/fullchains/{{var_authelia_and_nginx_domain}}.pem;
+	ssl_certificate /etc/ssl/fullchains/{{cfg_authelia_and_nginx.domain}}.pem;
 	include /etc/nginx/ssl-hardening.conf;
 	
 {{ authelia_common() }}

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

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,

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

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,

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

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,

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

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

roles/authelia-for-hedgedoc/defaults/main.json

@@ -1,5 +1,5 @@
 {
-	"var_authelia_for_hedgedoc_hedgedoc_url_base": "https://hedgedoc.example.org",
+	"cfg_authelia_for_hedgedoc_defaults": {
-	"var_authelia_for_hedgedoc_client_id": "hedgedoc",
+		"client_id": "hedgedoc"
-	"var_authelia_for_hedgedoc_client_secret": "REPLACE_ME"
+	}
 }

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,

roles/authelia-for-hedgedoc/templates/authelia-client-conf.json.j2

@@ -1,6 +1,6 @@
 {
-	"client_id": "{{var_authelia_for_hedgedoc_client_id}}",
+	"client_id": "{{cfg_authelia_for_hedgedoc.client_id}}",
-	"client_secret": "{{var_authelia_for_hedgedoc_client_secret}}",
+	"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"
+		"{{cfg_authelia_for_hedgedoc.hedgedoc_url_base}}/auth/oauth2/callback"
-	],
-	"grant_types": [
-		"refresh_token",
-		"authorization_code"
 	],
 	"response_types": [
 		"code"

roles/authelia-for-mas/defaults/main.json

@@ -1,6 +0,0 @@
-{
-	"var_authelia_for_mas_mas_url_base": "https://mas.example.org",
-	"var_authelia_for_mas_id": "01JADRQ54Y0KCQS0AEJQ4YTY36",
-	"var_authelia_for_mas_client_id": "mas",
-	"var_authelia_for_mas_client_secret": "REPLACE_ME"
-}

roles/authelia-for-mas/info.md

@@ -1,8 +0,0 @@
-## Beschreibung
-
-Um [MAS](../mas) gegen [Authelia](../authelia) authentifizieren zu lassen
-
-
-## Verweise
-
-- [MAS-Dokumentation | Configure an upstream SSO provider](https://element-hq.github.io/matrix-authentication-service/setup/sso.html)

roles/authelia-for-mas/templates/authelia-client-conf.json.j2

@@ -1,16 +0,0 @@
-{
-	"client_id": "{{var_authelia_for_mas_client_id}}",
-	"client_secret": "{{var_authelia_for_mas_client_secret}}",
-	"client_name": "MAS",
-	"public": false,
-	"authorization_policy": "one_factor",
-	"redirect_uris": [
-		"{{var_authelia_for_mas_mas_url_base}}/upstream/callback/{{var_authelia_for_mas_id}}"
-	],
-	"scopes": [
-		"openid",
-		"email",
-		"profile"
-	],
-	"token_endpoint_auth_method": "client_secret_basic"
-}

roles/authelia-for-mas/vardef.json

@@ -1,19 +0,0 @@
-{
-	"mas_url_base": {
-		"type": "string",
-		"mandatory": false
-	},
-	"id": {
-		"type": "string",
-		"mandatory": false,
-		"description": "needs to be a ULID"
-	},
-	"client_id": {
-		"type": "string",
-		"mandatory": false
-	},
-	"client_secret": {
-		"type": "string",
-		"mandatory": false
-	}
-}

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

roles/authelia-for-owncloud/defaults/main.json

@@ -1,8 +1,19 @@
 {
-	"var_authelia_for_owncloud_owncloud_url_base": "https://owncloud.example.org",
+	"cfg_authelia_for_owncloud_defaults": {
-	"var_authelia_for_owncloud_web_client_id": "owncloud_web",
+		"web": {
-	"var_authelia_for_owncloud_android_client_id": "owncloud_android",
+			"client_id": "owncloud_web"
-	"var_authelia_for_owncloud_android_client_secret": "REPLACE_ME",
+		},
-	"var_authelia_for_owncloud_ios_client_id": "owncloud_ios",
+		"desktop": {
-	"var_authelia_for_owncloud_ios_client_secret": "REPLACE_ME"
+			"client_id": "xdXOt13JKxym1B1QcEncf2XDkLAexMBFwiT9j6EfhhHFJhs2KM9jbjTmf8JBXE69",
+			"client_secret": "UBntmLjC2yYCeHwsyj73Uwo9TAaecAetRwMw0xYcvNL9yRdLSUi0hUAHfvCHFeFh"
+		},
+		"android": {
+			"client_id": "e4rAsNUSIUs0lF4nbv9FmCeUkTlV9GdgTLDH1b5uie7syb90SzEVrbN7HIpmWJeD",
+			"client_secret": "dInFYGV33xKzhbRmpqQltYNdfLdJIfJ9L5ISoKhNoT9qZftpdWSP71VrpGR9pmoD"
+		},
+		"ios": {
+			"client_id": "mxd5OQDk6es5LzOzRvidJNfXLUZS2oN3oUFeXPP8LpPrhx3UroJFduGEYIBOxkY1",
+			"client_secret": "KFeFWWEZO9TkisIQzR3fo7hfiMXlOpaqP8CFuTbSHzV1TUuGECglPxpiVKJfOXIx"
+		}
+	}
 }

roles/authelia-for-owncloud/tasks/main.json

@@ -1,18 +1,96 @@
 [
 	{
-		"name": "configuration | emplace",
+		"name": "show vars",
-		"become": true,
+		"when": "switch_show_vars",
-		"loop": [
+		"ansible.builtin.debug": {
-			{"src": "authelia-client-conf-web.json.j2", "dest": "/etc/authelia/conf.d/clients/owncloud-web.json"},
+			"var": "vars.cfg_authelia_for_owncloud"
-			{"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": "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,

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_id": "{{cfg_authelia_for_owncloud.android.client_id}}",
-	"client_secret": "{{var_authelia_for_owncloud_android_client_secret}}",
+	"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",
+		"email"
-		"offline_access"
 	],
 	"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"
 }

roles/authelia-for-owncloud/templates/authelia-client-conf-desktop.json.j2

@@ -1,17 +1,33 @@
 {
-	"client_id": "xdXOt13JKxym1B1QcEncf2XDkLAexMBFwiT9j6EfhhHFJhs2KM9jbjTmf8JBXE69",
+	"client_id": "{{cfg_authelia_for_owncloud.desktop.client_id}}",
-	"client_secret": "UBntmLjC2yYCeHwsyj73Uwo9TAaecAetRwMw0xYcvNL9yRdLSUi0hUAHfvCHFeFh",
+	"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",
+		"email"
-		"offline_access"
 	],
 	"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"
 }

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_id": "{{cfg_authelia_for_owncloud.ios.client_id}}",
-	"client_secret": "{{var_authelia_for_owncloud_ios_client_secret}}",
+	"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",
+		"email"
-		"offline_access"
 	],
 	"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"
 }

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": [
+	"grant_types": [
-		"{{var_authelia_for_owncloud_owncloud_url_base}}",
+		"authorization_code",
-		"{{var_authelia_for_owncloud_owncloud_url_base}}/oidc-callback.html",
+		"refresh_token"
-		"{{var_authelia_for_owncloud_owncloud_url_base}}/oidc-silent-redirect.html"
+	],
-	]
+	"access_token_signed_response_alg": "none",
+	"userinfo_signed_response_alg": "none",
+	"token_endpoint_auth_method": "none"
 }

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

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,

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

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

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)

roles/authelia-for-tandoor/tasks/main.json

@@ -1,10 +1,18 @@
 [
+	{
+		"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/mas.json"
+			"dest": "/etc/authelia/conf.d/clients/tandoor.json"
 		}
 	},
 	{

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

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,

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

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,

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

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": {
+	}
+}

roles/authelia/defaults/main.json

@@ -1,39 +1,45 @@
 {
-	"var_authelia_version": "4.37.5",
+	"cfg_authelia_defaults": {
-	"var_authelia_architecture": "amd64",
+		"listen_address": "0.0.0.0",
-	"var_authelia_listen_address": "0.0.0.0",
+		"users_file_path": "/var/authelia/users.yml",
-	"var_authelia_jwt_secret": "REPLACE_ME",
+		"log_file_path": "/var/authelia/log.jsonl",
-	"var_authelia_users_file_path": "/var/authelia/users.yml",
+		"storage": {
-	"var_authelia_log_file_path": "/var/authelia/log.jsonl",
+			"kind": "sqlite",
-	"var_authelia_domain": "authelia.example.org",
+			"data": {
-	"var_authelia_redirect_url": "https://example.org",
+				"path": "/var/authelia/state.db"
-	"var_authelia_session_domain": "example.org",
+			}
-	"var_authelia_session_secret": "REPLACE_ME",
+		},
-	"var_authelia_storage_encryption_key": "REPLACE_ME",
+		"ntp_server": "time.cloudflare.com:123",
-	"var_authelia_storage_kind": "sqlite",
+		"password_reset": {
-	"var_authelia_storage_data_sqlite_path": "/var/authelia/state.db",
+			"enabled": false,
-	"var_authelia_storage_data_postgresql_host": "localhost",
+			"custom_url": null
-	"var_authelia_storage_data_postgresql_port": 5432,
+		},
-	"var_authelia_storage_data_postgresql_username": "authelia_user",
+		"notification": {
-	"var_authelia_storage_data_postgresql_password": "REPLACE_ME",
+			"kind": "file",
-	"var_authelia_storage_data_postgresql_schema": "authelia",
+			"data": {
-	"var_authelia_storage_data_mariadb_host": "localhost",
+				"path": "/var/authelia/notifications"
-	"var_authelia_storage_data_mariadb_port": 3306,
+			}
-	"var_authelia_storage_data_mariadb_username": "authelia_user",
+		},
-	"var_authelia_storage_data_mariadb_password": "REPLACE_ME",
+		"oidc": {
-	"var_authelia_storage_data_mariadb_schema": "authelia",
+			"lifespan": {
-	"var_authelia_ntp_server": "time.cloudflare.com:123",
+				"default": {
-	"var_authelia_password_reset_enabled": false,
+					"access_token": "1d",
-	"var_authelia_password_reset_custom_url": null,
+					"refresh_token": "1h"
-	"var_authelia_notification_mode": "smtp",
+				},
-	"var_authelia_notification_file_path": "/var/authelia/notifications",
+				"custom": {
-	"var_authelia_notification_smtp_host": "smtp.example.org",
+					"long": {
-	"var_authelia_notification_smtp_port": 465,
+						"access_token": "2d",
-	"var_authelia_notification_smtp_username": "authelia",
+						"refresh_token": "3d"
-	"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",
+			"cors_endpoints": [
-	"var_authelia_oidc_lifespan_refresh_token": "1m",
+				"authorization",
-	"var_authelia_oidc_cors_endpoints": null
+				"token",
+				"revocation",
+				"introspection",
+				"userinfo"
+			]
+		}
+	}
 }

roles/authelia/tasks/main.json

@@ -1,42 +1,57 @@
 [
 	{
-		"name": "packages | prerequisites",
+		"name": "show vars",
-		"become": true,
+		"when": "switch_show_vars",
-		"ansible.builtin.apt": {
+		"ansible.builtin.debug": {
-			"update_cache": true,
+			"var": "vars.cfg_authelia"
-			"pkg": [
-				"apt-transport-https",
-				"gpg"
-			]
 		}
 	},
 	{
-		"name": "packages | keys",
+		"name": "packages",
-		"become": true,
+		"block": [
-		"ansible.builtin.apt_key": {
+			{
-			"url": "https://apt.authelia.com/organization/signing.asc"
+				"name": "prerequisites",
-		}
+				"become": true,
-	},
+				"ansible.builtin.apt": {
-	{
+					"update_cache": true,
-		"name": "packages | repository",
+					"pkg": [
-		"become": true,
+						"apt-transport-https",
-		"ansible.builtin.apt_repository": {
+						"ca-certificates",
-			"repo": "deb https://apt.authelia.com/stable/debian/debian/ all main"
+						"gpg"
-		}
+					]
+				}
+			},
+			{
+				"name": "keys",
+				"become": true,
+				"ansible.builtin.get_url": {
+					"url": "https://www.authelia.com/keys/authelia-security.gpg",
+					"dest": "/usr/share/keyrings/authelia-security.gpg"
+				}
+			},
+			{
+				"name": "repository",
+				"become": true,
+				"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,
+				"become": true,
-		"ansible.builtin.apt": {
+				"ansible.builtin.apt": {
-			"update_cache": true,
+					"update_cache": true,
-			"pkg": [
+					"pkg": [
-				"openssl",
+						"openssl",
-				"python3-cryptography",
+						"python3-cryptography",
-				"python3-yaml",
+						"python3-yaml",
-				"authelia"
+						"authelia"
-			]
+					]
-		}
+				}
+			}
+		]
 	},
 	{
 		"name": "generate private key for signing OIDC JWTs",
@@ -50,74 +65,88 @@
 		"register": "temp_tls_result"
 	},
 	{
-		"name": "configuration | compose script",
+		"name": "configuration",
-		"become": true,
+		"block": [
-		"ansible.builtin.copy": {
+			{
-			"src": "conf-compose.py",
+				"name": "configuration | compose script",
-			"dest": "/usr/bin/authelia-conf-compose",
+				"become": true,
-			"mode": "0700"
+				"ansible.builtin.copy": {
-		}
+					"src": "conf-compose.py",
-	},
+					"dest": "/usr/bin/authelia-conf-compose",
-	{
+					"mode": "0700"
-		"name": "configuration | directories",
+				}
-		"become": true,
+			},
-		"loop": [
+			{
-			"/etc/authelia/conf.d",
+				"name": "configuration | directories",
-			"/etc/authelia/conf.d/clients"
+				"become": true,
-		],
+				"loop": [
-		"ansible.builtin.file": {
+					"/etc/authelia/conf.d",
-			"state": "directory",
+					"/etc/authelia/conf.d/clients"
-			"path": "{{item}}"
+				],
-		}
+				"ansible.builtin.file": {
-	},
+					"state": "directory",
-	{
+					"path": "{{item}}"
-		"name": "configuration | main",
+				}
-		"become": true,
+			},
-		"ansible.builtin.template": {
+			{
-			"src": "conf-main.json.j2",
+				"name": "configuration | main",
-			"dest": "/etc/authelia/conf.d/main.json"
+				"become": true,
-		}
+				"ansible.builtin.template": {
-	},
+					"src": "conf-main.json.j2",
-	{
+					"dest": "/etc/authelia/conf.d/main.json"
-		"name": "configuration | compose",
+				}
-		"become": true,
+			},
-		"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": "configuration | compose",
-		}
+				"become": true,
+				"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",
-		"become": true,
+		"block": [
-		"ansible.builtin.file": {
+			{
-			"state": "directory",
+				"name": "directory",
-			"path": "{{var_authelia_users_file_path | dirname}}"
+				"become": true,
-		}
+				"ansible.builtin.file": {
-	},
+					"state": "directory",
-	{
+					"owner": "authelia",
-		"name": "users | initial file",
+					"group": "authelia",
-		"become": true,
+					"path": "{{cfg_authelia.users_file_path | dirname}}"
-		"ansible.builtin.template": {
+				}
-			"src": "users.yml.j2",
+			},
-			"dest": "{{var_authelia_users_file_path}}",
+			{
-			"force": false
+				"name": "initial file",
-		}
+				"become": true,
-	},
+				"ansible.builtin.template": {
-	{
+					"src": "users.yml.j2",
-		"name": "users | management script",
+					"dest": "{{cfg_authelia.users_file_path}}",
-		"become": true,
+					"force": false
-		"ansible.builtin.copy": {
+				}
-			"src": "user-manage.py",
+			},
-			"dest": "/usr/bin/authelia-user-manage",
+			{
-			"mode": "0700"
+				"name": "management script",
-		}
+				"become": true,
+				"ansible.builtin.copy": {
+					"src": "user-manage.py",
+					"dest": "/usr/bin/authelia-user-manage",
+					"mode": "0700"
+				}
+			}
+		]
 	},
 	{
 		"name": "apply",

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}}",
+				"domain": "{{cfg_authelia.session_domain}}",
-				"authelia_url": "https://{{var_authelia_domain}}/",
+				"authelia_url": "https://{{cfg_authelia.domain}}/",
-				"default_redirection_url": "{{var_authelia_redirect_url}}"
+				"default_redirection_url": "{{cfg_authelia.redirect_url}}"
 			}
 		]
 	},
@@ -139,45 +139,44 @@
 		"ban_time": "5m"
 	},
 	"storage": {
-		"encryption_key": "{{var_authelia_storage_encryption_key}}",
+		"encryption_key": "{{cfg_authelia.storage_encryption_key}}",
-{% if var_authelia_storage_kind == "sqlite" %}
+{% 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}}",
+			"username": "{{cfg_authelia.storage.data.username}}",
-			"password": "{{var_authelia_storage_data_postgresql_password}}",
+			"password": "{{cfg_authelia.storage.data.password}}",
-			"database": "{{var_authelia_storage_data_postgresql_schema}}"
+			"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}}",
+			"host": "{{cfg_authelia.storage.data.host}}",
-			"port": {{var_authelia_storage_data_mariadb_port | string}},
+			"port": {{cfg_authelia.storage.data.port | string}},
-			"username": "{{var_authelia_storage_data_mariadb_username}}",
+			"username": "{{cfg_authelia.storage.data.username}}",
-			"password": "{{var_authelia_storage_data_mariadb_password}}",
+			"password": "{{cfg_authelia.storage.data.password}}",
-			"database": "{{var_authelia_storage_data_mariadb_schema}}"
+			"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}}",
+			"address": "{{cfg_authelia.notification.data.host}}:{{cfg_authelia.notification.data.port | string}}",
-			"port": {{var_authelia_notification_smtp_port | string}},
+			"username": "{{cfg_authelia.notification.data.username}}",
-			"username": "{{var_authelia_notification_smtp_username}}",
+			"password": "{{cfg_authelia.notification.data.password}}",
-			"password": "{{var_authelia_notification_smtp_password}}",
+			"sender": "{{cfg_authelia.notification.data.sender}}",
-			"sender": "{{var_authelia_notification_smtp_sender}}",
 			"disable_require_tls": false,
 			"disable_html_emails": false,
 			"tls": {
@@ -188,17 +187,23 @@
 	},
 	"identity_providers": {
 		"oidc": {
-			"hmac_secret": "{{var_authelia_oidc_hmac_secret}}",
+			"hmac_secret": "{{cfg_authelia.oidc.hmac_secret}}",
-			"issuer_private_key": "{{temp_tls_result.privatekey | replace('\n', '\\n')}}",
+			"jwks": [
+				{
+					"algorithm": "RS256",
+					"key": "{{temp_tls_result.privatekey | replace('\n', '\\n')}}"
+				}
+			],
 			"lifespans": {
-				"access_token": "{{var_authelia_oidc_lifespan_access_token}}",
+				"access_token": "{{cfg_authelia.oidc.lifespan.default.access_token}}",
-				"refresh_token": "{{var_authelia_oidc_lifespan_refresh_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": [

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

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

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

roles/hedgedoc-and-nginx/defaults/main.json

@@ -1,4 +1,5 @@
 {
-	"var_hedgedoc_and_nginx_domain": "hedgedoc.example.org",
+	"cfg_hedgedoc_and_nginx_defaults": {
-	"var_hedgedoc_and_nginx_tls_mode": "force"
+		"tls_mode": "force"
+	}
 }

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}}",
+			"src": "/etc/nginx/sites-available/{{cfg_hedgedoc_and_nginx.domain}}",
-			"dest": "/etc/nginx/sites-enabled/{{var_hedgedoc_and_nginx_domain}}"
+			"dest": "/etc/nginx/sites-enabled/{{cfg_hedgedoc_and_nginx.domain}}"
 		}
 	},
 	{

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_key /etc/ssl/private/{{cfg_hedgedoc_and_nginx.domain}}.pem;
-	ssl_certificate /etc/ssl/fullchains/{{var_hedgedoc_and_nginx_domain}}.pem;
+	ssl_certificate /etc/ssl/fullchains/{{cfg_hedgedoc_and_nginx.domain}}.pem;
 	include /etc/nginx/ssl-hardening.conf;
 	
 {{ hedgedoc_common() }}

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

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

roles/hedgedoc/defaults/main.json

@@ -1,21 +1,22 @@
 {
-	"var_hedgedoc_user_name": "hedgedoc",
+	"cfg_hedgedoc_defaults": {
-	"var_hedgedoc_directory": "/opt/hedgedoc",
+		"user_name": "hedgedoc",
-	"var_hedgedoc_version": "1.9.9",
+		"directory": "/opt/hedgedoc",
-	"var_hedgedoc_session_secret": "REPLACE_ME",
+		"version": "1.10.3",
-	"var_hedgedoc_database_kind": "sqlite",
+		"database": {
-	"var_hedgedoc_database_data_sqlite_path": "/var/hedgedoc/data.sqlite",
+			"kind": "sqlite",
-	"var_hedgedoc_database_data_postgresql_host": "localhost",
+			"data": {
-	"var_hedgedoc_database_data_postgresql_port": 5432,
+				"path": "/var/hedgedoc/data.sqlite"
-	"var_hedgedoc_database_data_postgresql_username": "hedgedoc_user",
+			}
-	"var_hedgedoc_database_data_postgresql_password": "REPLACE_ME",
+		},
-	"var_hedgedoc_database_data_postgresql_schema": "hedgedoc",
+		"authentication": {
-	"var_hedgedoc_domain": "hedgedoc.example.org",
+			"kind": "internal",
-	"var_hedgedoc_authentication_kind": "internal",
+			"data": {
-	"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",
+		"guest_allow_create": false,
-	"var_hedgedoc_guest_allow_create": false,
+		"guest_allow_change": false,
-	"var_hedgedoc_guest_allow_change": false,
+		"free_names_mode": "authed",
-	"var_hedgedoc_free_names_mode": "authed"
+		"log_level": "error"
+	}
 }

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}}",
+			"dest": "{{cfg_hedgedoc.directory | dirname}}",
-			"owner": "{{var_hedgedoc_user_name}}"
+			"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"
 		}
 	},
 	{

roles/hedgedoc/templates/config.json.j2

@@ -1,61 +1,61 @@
 {
 	"production": {
-		"loglevel": "error",
+		"loglevel": "{{cfg_hedgedoc.log_level}}",
-{% if var_hedgedoc_database_kind == 'sqlite' %}
+{% 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}}",
+			"host": "{{cfg_hedgedoc.database.data.postgresql.host}}",
-			"port": {{var_hedgedoc_database_data_postgresql_port | to_json}},
+			"port": {{cfg_hedgedoc.database.data.postgresql.port | to_json}},
-			"username": "{{var_hedgedoc_database_data_postgresql_username}}",
+			"username": "{{cfg_hedgedoc.database.data.postgresql.username}}",
-			"password": "{{var_hedgedoc_database_data_postgresql_password}}",
+			"password": "{{cfg_hedgedoc.database.data.postgresql.password}}",
-			"database": "{{var_hedgedoc_database_data_postgresql_schema}}"
+			"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}}",
+			"providerName": "{{cfg_hedgedoc.authentication.data.authelia.provider_name}}",
-			"clientID": "{{var_hedgedoc_authentication_data_authelia_client_id}}",
+			"clientID": "{{cfg_hedgedoc.authentication.data.authelia.client_id}}",
-			"clientSecret": "{{var_hedgedoc_authentication_data_authelia_client_secret}}",
+			"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",
+			"userProfileURL": "{{cfg_hedgedoc.authentication.data.authelia.url_base}}/api/oidc/userinfo",
-			"tokenURL": "{{var_hedgedoc_authentication_data_authelia_url_base}}/api/oidc/token",
+			"tokenURL": "{{cfg_hedgedoc.authentication.data.authelia.url_base}}/api/oidc/token",
-			"authorizationURL": "{{var_hedgedoc_authentication_data_authelia_url_base}}/api/oidc/authorize"
+			"authorizationURL": "{{cfg_hedgedoc.authentication.data.authelia.url_base}}/api/oidc/authorization"
 		},
 		"email": false,
 		"allowEmailRegister": false,
 {% endif %}
-		"allowAnonymous": {{var_hedgedoc_guest_allow_create | to_json}},
+		"allowAnonymous": {{cfg_hedgedoc.guest_allow_create | to_json}},
-		"allowAnonymousEdits": {{var_hedgedoc_guest_allow_change | to_json}},
+		"allowAnonymousEdits": {{cfg_hedgedoc.guest_allow_change | to_json}},
-{% if var_hedgedoc_free_names_mode == 'never' %}
+{% 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 %}

roles/hedgedoc/templates/systemd-unit.j2

@@ -3,8 +3,8 @@ Description=Hedgedoc
 After=multi-user.target
 
 [Service]
-WorkingDirectory={{var_hedgedoc_directory}}
+WorkingDirectory={{cfg_hedgedoc.directory}}
-User={{var_hedgedoc_user_name}}
+User={{cfg_hedgedoc.user_name}}
 Environment="NODE_ENV=production"
 ExecStart=yarn start
 SyslogIdentifier=hedgedoc

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

roles/mas-and-nginx/defaults/main.json

@@ -1,5 +0,0 @@
-{
-	"var_mas_and_nginx_server_port": 2839,
-	"var_mas_and_nginx_domain": "REPLACE_ME",
-	"var_mas_and_nginx_tls_mode": "force"
-}

roles/mas-and-nginx/info.md

@@ -1,8 +0,0 @@
-## Beschreibung
-
-- zur Einrichtung von [nginx](../nginx) als Reverse-Proxy für [MAS](../mas)
-
-
-## Verweise
-
-- [MAS-Dokumentation | Configuring a reverse proxy](https://element-hq.github.io/matrix-authentication-service/setup/reverse-proxy.html)

roles/mas-and-nginx/templates/conf.j2

@@ -1,36 +0,0 @@
-{% macro mas_common() %}
-	location / {
-		proxy_http_version 1.1;
-		proxy_pass http://localhost:{{var_mas_and_nginx_server_port | string}};
-		
-		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-	}
-{% endmacro %}
-
-server {
-	server_name {{var_mas_and_nginx_domain}};
-	
-	listen 80;
-	listen [::]:80;
-	
-{% if (var_mas_and_nginx_tls_mode == 'force') %}
-	return 301 https://$http_host$request_uri;
-{% else %}
-{{ mas_common() }}
-{% endif %}
-}
-
-{% if (var_mas_and_nginx_tls_mode != 'disable') %}
-server {
-	server_name {{var_mas_and_nginx_domain}};
-	
-	listen 443 ssl http2;
-	listen [::]:443 ssl http2;
-	
-	ssl_certificate_key /etc/ssl/private/{{var_mas_and_nginx_domain}}.pem;
-	ssl_certificate /etc/ssl/fullchains/{{var_mas_and_nginx_domain}}.pem;
-	include /etc/nginx/ssl-hardening.conf;
-	
-{{ mas_common() }}
-}
-{% endif %}

roles/mas-for-synapse/defaults/main.json

@@ -1,5 +0,0 @@
-{
-	"var_mas_for_synapse_synapse_url_base": "https://synapse.example.org",
-	"var_mas_for_synapse_client_id": "01JAE3YFB91XFWEDQY0WFDW5VN",
-	"var_mas_for_synapse_client_secret": "REPLACE_ME"
-}

roles/mas-for-synapse/info.md

@@ -1,9 +0,0 @@
-## Beschreibung
-
-Um [Synapse](../synapse) gegen [MAS](../mas) authentifizieren zu lassen
-
-
-## Verweise
-
-- [Synapse-Dokumentation | OpenID Connect](https://matrix-org.github.io/synapse/latest/openid.html)
-- [MAS-Dokumentation | Homeserver configuration](https://element-hq.github.io/matrix-authentication-service/setup/homeserver.html)

roles/mas-for-synapse/tasks/main.json

@@ -1,25 +0,0 @@
-[
-	{
-		"name": "configuration | emplace",
-		"become": true,
-		"ansible.builtin.template": {
-			"src": "mas-client-conf.json.j2",
-			"dest": "/opt/mas/conf.d/clients/synapse.json"
-		}
-	},
-	{
-		"name": "configuration | apply",
-		"become": true,
-		"ansible.builtin.command": {
-			"cmd": "/usr/local/bin/mas-conf-compose"
-		}
-	},
-	{
-		"name": "restart service",
-		"become": true,
-		"ansible.builtin.systemd_service": {
-			"state": "restarted",
-			"name": "mas"
-		}
-	}
-]

roles/mas-for-synapse/templates/mas-client-conf.json.j2

@@ -1,5 +0,0 @@
-{
-	"client_id": "{{var_mas_for_synapse_client_id}}",
-	"client_secret": "{{var_mas_for_synapse_client_secret}}",
-	"client_auth_method": "client_secret_basic"
-}

roles/mas/defaults/main.json

@@ -1,23 +0,0 @@
-{
-	"var_mas_user": "mas",
-	"var_mas_directory": "/opt/mas",
-	"var_mas_server_server_address": "[::]",
-	"var_mas_server_server_port": 2839,
-	"var_mas_server_server_domain": "mas.example.org",
-	"var_mas_database_host": "postgresql.example.org",
-	"var_mas_database_port": 5432,
-	"var_mas_database_username": "mas_user",
-	"var_mas_database_password": "REPLACE_ME",
-	"var_mas_database_schema": "mas",
-	"var_mas_matrix_server": "synapse.example.org",
-	"var_mas_matrix_secret": "REPLACE_ME",
-	"var_mas_matrix_endpoint": "https://synapse.example.org/",
-	"var_mas_encryption_key": "REPLACE_ME",
-	"var_mas_authentication_upstream_kind": "none",
-	"var_mas_authentication_upstream_data_authelia_url_base": "https://authelia.example.org",
-	"var_mas_authentication_upstream_data_authelia_auth_method": "client_secret_basic",
-	"var_mas_authentication_upstream_data_authelia_scope": "openid profile email",
-	"var_mas_authentication_upstream_data_authelia_id": "01JADRQ54Y0KCQS0AEJQ4YTY36",
-	"var_mas_authentication_upstream_data_authelia_client_id": "mas",
-	"var_mas_authentication_upstream_data_authelia_client_secret": "REPLACE_ME"
-}

roles/mas/files/conf-compose.py

@@ -1,160 +0,0 @@
-#!/usr/bin/env python3
-
-import sys as _sys
-import os as _os
-import yaml as _yaml
-import json as _json
-import argparse as _argparse
-
-
-def file_read(path):
-	handle = open(path, "r")
-	content = handle.read()
-	handle.close()
-	return content
-	
-
-def file_write(path, content):
-	directory = _os.path.dirname(path)
-	if (not _os.path.exists(directory)):
-		_os.makedirs(directory, exist_ok = True)
-	else:
-		pass
-	handle = open(path, "w")
-	handle.write(content)
-	handle.close()
-	return content
-	
-
-def dict_merge(core, mantle, path = None):
-	if (path is None):
-		path = []
-	result = {}
-	for source in [core, mantle]:
-		for (key, value_new, ) in source.items():
-			path_ = (path + [key])
-			type_new = type(value_new)
-			if (not (key in result)):
-				result[key] = value_new
-			else:
-				value_old = result[key]
-				type_old = type(value_old)
-				if (value_old is None):
-					result[key] = value_new
-				else:
-					if (not (type_old == type_new)):
-						raise ValueError(
-							"type mismatch at path %s: %s vs. %s"
-							% (
-								".".join(path),
-								str(type_old),
-								str(type_new),
-							)
-						)
-					else:
-						if (type_old == dict):
-							result[key] = dict_merge(value_old, value_new, path_)
-						elif (type_old == list):
-							result[key] = (value_old + value_new)
-						else:
-							result[key] = value_new
-	return result
-	
-
-def main():
-	## args
-	argument_parser = _argparse.ArgumentParser()
-	argument_parser.add_argument(
-		"-s",
-		"--source-directory",
-		type = str,
-		dest = "source_directory",
-		default = "/opt/mas/conf.d",
-		metavar = "<source-directory>",
-	)
-	argument_parser.add_argument(
-		"-f",
-		"--output-format",
-		type = str,
-		choices = ["json", "yaml"],
-		dest = "output_format",
-		default = "yaml",
-		metavar = "<output-format>",
-	)
-	argument_parser.add_argument(
-		"-o",
-		"--output-path",
-		type = str,
-		dest = "output_path",
-		default = "/opt/mas/config.yaml",
-		metavar = "<output-path>",
-	)
-	args = argument_parser.parse_args()
-	
-	## exec
-	data = {}
-	### base
-	if True:
-		data_raw = _yaml.safe_load(file_read(_os.path.join(args.source_directory, "base.yaml")))
-		data = dict_merge(
-			data,
-			{
-				"secrets": data_raw["secrets"],
-				"passwords": data_raw["passwords"],
-			}
-		)
-	### database
-	if True:
-		data = dict_merge(
-			data,
-			_json.loads(file_read(_os.path.join(args.source_directory, "database.json")))
-		)
-	### http
-	if True:
-		data = dict_merge(
-			data,
-			_json.loads(file_read(_os.path.join(args.source_directory, "http.json")))
-		)
-	### matrix
-	if True:
-		data = dict_merge(
-			data,
-			_json.loads(file_read(_os.path.join(args.source_directory, "matrix.json")))
-		)
-	### upstream
-	if True:
-		data = dict_merge(
-			data,
-			_json.loads(file_read(_os.path.join(args.source_directory, "upstream.json")))
-		)
-	### email
-	if True:
-		data = dict_merge(
-			data,
-			_json.loads(file_read(_os.path.join(args.source_directory, "email.json")))
-		)
-	### clients
-	if True:
-		data = dict_merge(
-			data,
-			{
-				"clients": list(
-					map(
-						lambda name: _json.loads(file_read(_os.path.join(args.source_directory, "clients", name))),
-						_os.listdir(_os.path.join(args.source_directory, "clients"))
-					)
-				),
-			}
-		)
-	## output
-	if True:
-		if (args.output_format == "json"):
-			output_content = _json.dumps(data, indent = "\t")
-		elif (args.output_format == "yaml"):
-			output_content = _yaml.dump(data)
-		else:
-			raise ValueError("invalid output format")
-		file_write(args.output_path, output_content)
-	
-
-main()

roles/mas/info.md

@@ -1,8 +0,0 @@
-## Beschreibung
-
-für [Matrix Authentication Service](https://github.com/element-hq/matrix-authentication-service), was eine OIDC-Portal für [Synapse](../synapse) ist
-
-
-## Verweise
-
-- [Dokumentation](https://element-hq.github.io/matrix-authentication-service/index.html)

roles/mas/tasks/main.json

@@ -1,123 +0,0 @@
-[
-	{
-		"name": "user",
-		"become": true,
-		"ansible.builtin.user": {
-			"name": "{{var_mas_user}}",
-			"create_home": true,
-			"home": "{{var_mas_directory}}"
-		}
-	},
-	{
-		"name": "directories",
-		"become": true,
-		"loop": [
-			"{{var_mas_directory}}/conf.d",
-			"{{var_mas_directory}}/conf.d/clients",
-			"{{var_mas_directory}}/scripts"
-		],
-		"ansible.builtin.file": {
-			"state": "directory",
-			"owner": "{{var_mas_user}}",
-			"path": "{{item}}"
-		}
-	},
-	{
-		"name": "download",
-		"become": true,
-		"become_user": "{{var_mas_user}}",
-		"ansible.builtin.get_url": {
-			"url": "https://github.com/element-hq/matrix-authentication-service/releases/latest/download/mas-cli-x86_64-linux.tar.gz",
-			"dest": "/tmp/mas.tar.gz"
-		}
-	},
-	{
-		"name": "extract",
-		"become": true,
-		"become_user": "{{var_mas_user}}",
-		"ansible.builtin.unarchive": {
-			"remote_src": true,
-			"src": "/tmp/mas.tar.gz",
-			"dest": "{{var_mas_directory}}",
-			"owner": "{{var_mas_user}}"
-		}
-	},
-	{
-		"name": "configuration | compose script",
-		"become": true,
-		"ansible.builtin.copy": {
-			"src": "conf-compose.py",
-			"dest": "/usr/local/bin/mas-conf-compose",
-			"mode": "0555"
-		}
-	},
-	{
-		"name": "configuration | base",
-		"become": true,
-		"become_user": "{{var_mas_user}}",
-		"ansible.builtin.shell": {
-			"cmd": "./mas-cli config generate > {{var_mas_directory}}/conf.d/base.yaml",
-			"chdir": "{{var_mas_directory}}"
-		}
-	},
-	{
-		"name": "configuration | database",
-		"become": true,
-		"become_user": "{{var_mas_user}}",
-		"ansible.builtin.template": {
-			"src": "config-database.json.j2",
-			"dest": "{{var_mas_directory}}/conf.d/database.json"
-		}
-	},
-	{
-		"name": "configuration | http",
-		"become": true,
-		"become_user": "{{var_mas_user}}",
-		"ansible.builtin.template": {
-			"src": "config-http.json.j2",
-			"dest": "{{var_mas_directory}}/conf.d/http.json"
-		}
-	},
-	{
-		"name": "configuration | matrix",
-		"become": true,
-		"become_user": "{{var_mas_user}}",
-		"ansible.builtin.template": {
-			"src": "config-matrix.json.j2",
-			"dest": "{{var_mas_directory}}/conf.d/matrix.json"
-		}
-	},
-	{
-		"name": "configuration | upstream",
-		"become": true,
-		"become_user": "{{var_mas_user}}",
-		"ansible.builtin.template": {
-			"src": "config-upstream.json.j2",
-			"dest": "{{var_mas_directory}}/conf.d/upstream.json"
-		}
-	},
-	{
-		"name": "configuration | apply",
-		"become": true,
-		"ansible.builtin.command": {
-			"cmd": "/usr/local/bin/mas-conf-compose"
-		}
-	},
-	{
-		"name": "systemd unit",
-		"become": true,
-		"ansible.builtin.template": {
-			"src": "systemd_unit.j2",
-			"dest": "/etc/systemd/system/mas.service"
-		}
-	},
-	{
-		"name": "run",
-		"become": true,
-		"ansible.builtin.systemd_service": {
-			"name": "mas",
-			"enabled": true,
-			"state": "restarted"
-		}
-	}
-]

roles/mas/templates/config-database.json.j2

@@ -1,9 +0,0 @@
-{
-	"database": {
-		"host": "{{var_mas_database_host}}",
-		"port": {{var_mas_database_port | string}},
-		"username": "{{var_mas_database_username}}",
-		"password": "{{var_mas_database_password}}",
-		"database": "{{var_mas_database_schema}}"
-	}
-}

roles/mas/templates/config-email.json.j2

@@ -1,7 +0,0 @@
-{
-	"email": {
-		"from": "Authentication Service <root@localhost>",
-		"reply_to": "Authentication Service <root@localhost>",
-		"transport": "blackhole"
-	}
-}

roles/mas/templates/config-http.json.j2

@@ -1,60 +0,0 @@
-{
-	"http": {
-		"listeners": [
-			{
-				"name": "web",
-				"resources": [
-					{
-						"name": "discovery"
-					},
-					{
-						"name": "human"
-					},
-					{
-						"name": "oauth"
-					},
-					{
-						"name": "compat"
-					},
-					{
-						"name": "graphql"
-					},
-					{
-						"name": "assets"
-					}
-				],
-				"binds": [
-					{
-						"address": "{{var_mas_server_server_address}}:{{var_mas_server_server_port | string}}"
-					}
-				],
-				"proxy_protocol": false
-			},
-			{
-				"name": "internal",
-				"resources": [
-					{
-						"name": "health"
-					}
-				],
-				"binds": [
-					{
-						"host": "localhost",
-						"port": 8081
-					}
-				],
-				"proxy_protocol": false
-			}
-		],
-		"trusted_proxies": [
-			"192.168.0.0/16",
-			"172.16.0.0/12",
-			"10.0.0.0/10",
-			"127.0.0.1/8",
-			"fd00::/8",
-			"::1/128"
-		],
-		"public_base": "https://{{var_mas_server_server_domain}}/",
-		"issuer": "https://{{var_mas_server_server_domain}}/"
-	}
-}

roles/mas/templates/config-matrix.json.j2

@@ -1,7 +0,0 @@
-{
-	"matrix": {
-		"homeserver": "{{var_mas_matrix_server}}",
-		"secret": "{{var_mas_matrix_secret}}",
-		"endpoint": "{{var_mas_matrix_endpoint}}"
-	}
-}

roles/mas/templates/config-upstream.json.j2

@@ -1,35 +0,0 @@
-{
-{% if var_mas_authentication_upstream_kind == 'none' %}
-{% endif %}
-{% if var_mas_authentication_upstream_kind == 'authelia' %}
-	"upstream_oauth2": {
-		"providers": [
-			{
-				"id": "{{var_mas_authentication_upstream_data_authelia_id}}",
-				"issuer": "{{var_mas_authentication_upstream_data_authelia_url_base}}",
-				"authorization_endpoint": "{{var_mas_authentication_upstream_data_authelia_url_base}}/api/oidc/authorization",
-				"token_endpoint": "{{var_mas_authentication_upstream_data_authelia_url_base}}/api/oidc/token",
-				"token_endpoint_auth_method": "{{var_mas_authentication_upstream_data_authelia_auth_method}}",
-				"scope": "{{var_mas_authentication_upstream_data_authelia_scope}}",
-				"discovery_mode": "insecure",
-				"client_id": "{{var_mas_authentication_upstream_data_authelia_client_id}}",
-				"client_secret": "{{var_mas_authentication_upstream_data_authelia_client_secret}}",
-				"claims_imports": {
-					"localpart": {
-						"action": "require",
-						"template": "{{"{{"}} user.preferred_username {{"}}"}}"
-					},
-					"displayname": {
-						"action": "suggest",
-						"template": "{{"{{"}} user.name {{"}}"}}"
-					},
-					"email": {
-						"action": "suggest",
-						"template": "{{"{{"}} user.email {{"}}"}}",
-						"set_email_verification": "always"
-					}
-				}
-		]
-	}
-{% endif %}	
-}

roles/mas/templates/systemd_unit.j2

@@ -1,15 +0,0 @@
-[Unit]
-Description=MAS
-After=network.target
-
-[Service]
-WorkingDirectory={{var_mas_directory}}
-ExecStart={{var_mas_directory}}/mas-cli server
-Type=simple
-Restart=always
-User={{var_mas_user}}
-
-[Install]
-WantedBy=default.target
-RequiredBy=network.target
-

roles/mas/vardef.json

@@ -1,91 +0,0 @@
-{
-	"user": {
-		"type": "string",
-		"mandatory": false
-	},
-	"directory": {
-		"type": "string",
-		"mandatory": false
-	},
-	"server_address": {
-		"type": "string",
-		"mandatory": false
-	},
-	"server_port": {
-		"type": "string",
-		"mandatory": false
-	},
-	"domain": {
-		"type": "string",
-		"mandatory": false
-	},
-	"database_host": {
-		"type": "string",
-		"mandatory": false
-	},
-	"database_port": {
-		"type": "integer",
-		"mandatory": false
-	},
-	"database_username": {
-		"type": "string",
-		"mandatory": false
-	},
-	"database_password": {
-		"type": "string",
-		"mandatory": true
-	},
-	"database_schema": {
-		"type": "string",
-		"mandatory": false
-	},
-	"matrix_server": {
-		"type": "string",
-		"mandatory": false
-	},
-	"matrix_secret": {
-		"type": "string",
-		"mandatory": true
-	},
-	"matrix_endpoint": {
-		"type": "string",
-		"mandatory": false
-	},
-	"encryption_key": {
-		"type": "string",
-		"mandatory": true
-	},
-	"authentication_upstream_kind": {
-		"nullable": false,
-		"type": "string",
-		"options": [
-			"none",
-			"authelia"
-		]
-	},
-	"authentication_upstream_data_authelia_url_base": {
-		"type": "string",
-		"mandatory": false
-	},
-	"authentication_upstream_data_authelia_auth_method": {
-		"type": "string",
-		"mandatory": false
-	},
-	"authentication_upstream_data_authelia_scope": {
-		"type": "string",
-		"mandatory": false
-	},
-	"authentication_upstream_data_authelia_id": {
-		"type": "string",
-		"mandatory": false,
-		"description": "needs to be a ULID"
-	},
-	"authentication_upstream_data_authelia_client_id": {
-		"type": "string",
-		"mandatory": false
-	},
-	"authentication_upstream_data_authelia_client_secret": {
-		"type": "string",
-		"mandatory": false
-	}
-}

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

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

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,49 +31,54 @@
 	{
 		"name": "place hardening config",
 		"become": true,
-		"ansible.builtin.copy": {
+		"ansible.builtin.template": {
-			"src": "ssl-hardening.conf",
+			"src": "ssl-hardening.conf.j2",
 			"dest": "/etc/nginx/ssl-hardening.conf"
 		}
 	},
 	{
-		"name": "ufw | check",
+		"name": "ufw",
-		"become": true,
+		"block": [
-		"check_mode": true,
+			{
-		"community.general.ufw": {
+				"name": "check",
-			"state": "enabled"
+				"become": true,
-		},
+				"check_mode": true,
-		"register": "ufw_enable_check"
+				"community.general.ufw": {
-	},
+					"state": "enabled"
-	{
+				},
-		"name": "ufw | allow port 80",
+				"register": "ufw_enable_check"
-		"when": "not ufw_enable_check.changed",
+			},
-		"become": true,
+			{
-		"community.general.ufw": {
+				"name": "allow port 80",
-			"rule": "allow",
+				"when": "not ufw_enable_check.changed",
-			"port": "80",
+				"become": true,
-			"proto": "tcp"
+				"community.general.ufw": {
-		}
+					"rule": "allow",
-	},
+					"port": "80",
-	{
+					"proto": "tcp"
-		"name": "ufw | allow port 443",
+				}
-		"when": "not ufw_enable_check.changed",
+			},
-		"become": true,
+			{
-		"community.general.ufw": {
+				"name": "allow port 443",
-			"rule": "allow",
+				"when": "not ufw_enable_check.changed",
-			"port": "443",
+				"become": true,
-			"proto": "tcp"
+				"community.general.ufw": {
-		}
+					"rule": "allow",
+					"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": "*",

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;

roles/nginx/vardef.json

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

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

roles/owncloud-and-nginx/defaults/main.json

@@ -1,5 +1,6 @@
 {
-	"var_owncloud_and_nginx_domain": "owncloud.example.org",
+	"cfg_owncloud_and_nginx_defaults": {
-	"var_owncloud_and_nginx_tls_mode": "force",
+		"tls_mode": "force",
-	"var_owncloud_and_nginx_maximum_upload_size": "1G"
+		"maximum_upload_size": "1G"
+	}
 }

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}}",
+			"src": "/etc/nginx/sites-available/{{cfg_owncloud_and_nginx.domain}}",
-			"dest": "/etc/nginx/sites-enabled/{{var_owncloud_and_nginx_domain}}"
+			"dest": "/etc/nginx/sites-enabled/{{cfg_owncloud_and_nginx.domain}}"
 		}
 	},
 	{

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_key /etc/ssl/private/{{cfg_owncloud_and_nginx.domain}}.pem;
-	ssl_certificate /etc/ssl/fullchains/{{var_owncloud_and_nginx_domain}}.pem;
+	ssl_certificate /etc/ssl/fullchains/{{cfg_owncloud_and_nginx.domain}}.pem;
 	include /etc/nginx/ssl-hardening.conf;
 	
 	{{ owncloud_common() }}

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

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

roles/owncloud/defaults/main.json

@@ -1,18 +1,16 @@
 {
-	"var_owncloud_user": "owncloud",
+	"cfg_owncloud_defaults": {
-	"var_owncloud_directory": "/opt/owncloud",
+		"user": "owncloud",
-	"var_owncloud_version": "5.0.0",
+		"directory": "/opt/owncloud",
-	"var_owncloud_platform": "linux-amd64",
+		"version": "7.2.0",
-	"var_owncloud_domain": "owncloud.example.org",
+		"platform": "linux-amd64",
-	"var_owncloud_admin_password": "REPLACE_ME",
+		"domain": "owncloud.example.org",
-	"var_owncloud_authentication_kind": "internal",
+		"authentication": {
-	"var_owncloud_authentication_data_authelia_url_base": "https://authelia.example.org",
+			"kind": "internal"
-	"var_owncloud_authentication_data_authelia_web_client_id": "owncloud_web",
+		},
-	"var_owncloud_authentication_data_authelia_web_client_secret": "REPLACE_ME",
+		"public_share": {
-	"var_owncloud_authentication_data_authelia_android_client_id": "owncloud_android",
+			"password_necessity": "writable",
-	"var_owncloud_authentication_data_authelia_android_client_secret": "REPLACE_ME",
+			"password_policy_active": true
-	"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
 }

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`

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}}",
+			"url": "https://download.owncloud.com/ocis/ocis/stable/{{cfg_owncloud.version}}/ocis-{{cfg_owncloud.version}}-{{cfg_owncloud.platform}}",
-			"dest": "{{var_owncloud_directory}}/ocis",
+			"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}}",
+			"chdir": "{{cfg_owncloud.directory}}",
-			"cmd": "rm -f {{var_owncloud_directory}}/.ocis/config/ocis.yaml && ./ocis init --insecure no --admin-password={{var_owncloud_admin_password}}"
+			"cmd": "./ocis init --insecure no --admin-password={{cfg_owncloud.admin_password}}"
-		}
-	},
-	{
-		"name": "configuration",
-		"become": true,
-		"become_user": "{{var_owncloud_user}}",
-		"ansible.builtin.template": {
-			"src": "env.j2",
-			"dest": "{{var_owncloud_directory}}/.env"
 		}
 	},
 	{

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

roles/owncloud/templates/env.j2

@@ -1,44 +1,62 @@
-OCIS_URL="https://{{var_owncloud_domain}}"
+## web client
-OCIS_INSECURE="false"
+WEB_LOG_LEVEL=info
-
+WEB_LOG_FILE={{cfg_owncloud.directory}}/log/web
-PROXY_TLS="false"
+WEB_LOG_PRETTY=true
-
+WEB_LOG_COLOR=true
-{% if var_owncloud_authentication_kind == 'internal' %}
+{% if cfg_owncloud.authentication.kind == 'internal' %}
-PROXY_AUTOPROVISION_ACCOUNTS="false"
+{% 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' %}
+## other clients
-OCIS_OIDC_CLIENT_ID="{{var_owncloud_authentication_data_authelia_web_client_id}}"
+PROXY_LOG_LEVEL=info
-OCIS_OIDC_ISSUER="{{var_owncloud_authentication_data_authelia_url_base}}"
+PROXY_LOG_FILE={{cfg_owncloud.directory}}/log/proxy
-
+PROXY_LOG_PRETTY=true
-PROXY_AUTOPROVISION_ACCOUNTS="true"
+PROXY_LOG_COLOR=true
-PROXY_OIDC_REWRITE_WELLKNOWN="true"
+PROXY_CSP_CONFIG_FILE_LOCATION={{cfg_owncloud.directory}}/csp.yaml
-PROXY_OIDC_ACCESS_TOKEN_VERIFY_METHOD="none"
+PROXY_TLS=false
-PROXY_OIDC_INSECURE="false"
+{% if cfg_owncloud.authentication.kind == 'internal' %}
-PROXY_USER_OIDC_CLAIM="name"
+PROXY_AUTOPROVISION_ACCOUNTS=false
-PROXY_USER_CS3_CLAIM="username"
+{% endif %}
-
+{% if cfg_owncloud.authentication.kind == 'authelia' %}
-WEB_OIDC_AUTHORITY="{{var_owncloud_authentication_data_authelia_url_base}}"
+OCIS_URL=https://{{cfg_owncloud.domain}}
-WEB_OIDC_METADATA_URL="{{var_owncloud_authentication_data_authelia_url_base}}/.well-known/openid-configuration"
+PROXY_OIDC_ISSUER={{cfg_owncloud.authentication.data.url_base}}
-WEB_OIDC_CLIENT_ID="{{var_owncloud_authentication_data_authelia_web_client_id}}"
+PROXY_OIDC_REWRITE_WELLKNOWN=true
-WEB_OIDC_SCOPE="openid profile email groups"
+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' %}
+## sharing
-OCIS_SHARING_PUBLIC_SHARE_MUST_HAVE_PASSWORD="false"
+{% if cfg_owncloud.public_share.password_necessity == 'nothing' %}
-OCIS_SHARING_PUBLIC_WRITEABLE_SHARE_MUST_HAVE_PASSWORD="false"
+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' %}
+{% if cfg_owncloud.public_share.password_necessity == 'writable' %}
-OCIS_SHARING_PUBLIC_SHARE_MUST_HAVE_PASSWORD="false"
+OCIS_SHARING_PUBLIC_SHARE_MUST_HAVE_PASSWORD=false
-OCIS_SHARING_PUBLIC_WRITEABLE_SHARE_MUST_HAVE_PASSWORD="true"
+OCIS_SHARING_PUBLIC_WRITEABLE_SHARE_MUST_HAVE_PASSWORD=true
 {% endif %}
-{% if var_owncloud_public_share_password_necessity == 'all' %}
+{% if cfg_owncloud.public_share.password_necessity == 'all' %}
-OCIS_SHARING_PUBLIC_SHARE_MUST_HAVE_PASSWORD="true"
+OCIS_SHARING_PUBLIC_SHARE_MUST_HAVE_PASSWORD=true
-OCIS_SHARING_PUBLIC_WRITEABLE_SHARE_MUST_HAVE_PASSWORD="true"
+OCIS_SHARING_PUBLIC_WRITEABLE_SHARE_MUST_HAVE_PASSWORD=true
 {% endif %}
-
+{% if cfg_owncloud.public_share.password_policy_active %}
-{% if var_owncloud_public_share_password_policy_active %}
+OCIS_SHARING_PASSWORD_POLICY_DISABLED=false
-OCIS_SHARING_PASSWORD_POLICY_DISABLED="false"
 {% else %}
-OCIS_SHARING_PASSWORD_POLICY_DISABLED="true"
+OCIS_SHARING_PASSWORD_POLICY_DISABLED=true
 {% endif %}
+

roles/owncloud/templates/systemd_unit.j2

@@ -3,12 +3,12 @@ Description=ownCloud
 After=network.target
 
 [Service]
-WorkingDirectory={{var_owncloud_directory}}
+WorkingDirectory={{cfg_owncloud.directory}}
-EnvironmentFile={{var_owncloud_directory}}/.env
+EnvironmentFile={{cfg_owncloud.directory}}/.env
-ExecStart={{var_owncloud_directory}}/ocis server
+ExecStart={{cfg_owncloud.directory}}/ocis server
 Type=simple
 Restart=always
-User={{var_owncloud_user}}
+User={{cfg_owncloud.user}}
 
 [Install]
 WantedBy=default.target

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

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

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

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

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

roles/postgresql-for-mas/defaults/main.json

@@ -1,5 +0,0 @@
-{
-	"var_postgresql_for_mas_username": "mas_user",
-	"var_postgresql_for_mas_password": "REPLACE_ME",
-	"var_postgresql_for_mas_schema": "mas"
-}

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

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

roles/postgresql-for-tandoor/tasks/main.json

@@ -6,7 +6,8 @@
 			"update_cache": true,
 			"pkg": [
 				"acl",
-				"python3-psycopg2"
+				"python3-psycopg2",
+				"libpq-dev"
 			]
 		}
 	},
@@ -16,8 +17,8 @@
 		"become_user": "postgres",
 		"community.postgresql.postgresql_user": {
 			"state": "present",
-			"name": "{{var_postgresql_for_mas_username}}",
+			"name": "{{var_postgresql_for_tandoor_username}}",
-			"password": "{{var_postgresql_for_mas_password}}"
+			"password": "{{var_postgresql_for_tandoor_password}}"
 		},
 		"environment": {
 			"PGOPTIONS": "-c password_encryption=scram-sha-256"
@@ -29,8 +30,8 @@
 		"become_user": "postgres",
 		"community.postgresql.postgresql_db": {
 			"state": "present",
-			"name": "{{var_postgresql_for_mas_schema}}",
+			"name": "{{var_postgresql_for_tandoor_schema}}",
-			"owner": "{{var_postgresql_for_mas_username}}"
+			"owner": "{{var_postgresql_for_tandoor_username}}"
 		}
 	},
 	{
@@ -39,9 +40,9 @@
 		"become_user": "postgres",
 		"community.postgresql.postgresql_privs": {
 			"state": "present",
-			"db": "{{var_postgresql_for_mas_schema}}",
+			"login_db": "{{var_postgresql_for_tandoor_schema}}",
 			"objs": "ALL_IN_SCHEMA",
-			"roles": "{{var_postgresql_for_mas_username}}",
+			"roles": "{{var_postgresql_for_tandoor_username}}",
 			"privs": "ALL",
 			"grant_option": true
 		}