Merge pull request 'Rolle | Tandoor' (#6) from task-230-tandoor into main

Reviewed-on: #6

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/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_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_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",
@@ -12,10 +12,6 @@
 	"redirect_uris": [
 		"{{var_authelia_for_hedgedoc_hedgedoc_url_base}}/auth/oauth2/callback"
 	],
-	"grant_types": [
-		"refresh_token",
-		"authorization_code"
-	],
 	"response_types": [
 		"code"
 	],

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

@@ -4,5 +4,7 @@
 	"var_authelia_for_owncloud_android_client_id": "owncloud_android",
 	"var_authelia_for_owncloud_android_client_secret": "REPLACE_ME",
 	"var_authelia_for_owncloud_ios_client_id": "owncloud_ios",
-	"var_authelia_for_owncloud_ios_client_secret": "REPLACE_ME"
+	"var_authelia_for_owncloud_ios_client_secret": "REPLACE_ME",
+	"var_authelia_for_owncloud_desktop_client_id": "xdXOt13JKxym1B1QcEncf2XDkLAexMBFwiT9j6EfhhHFJhs2KM9jbjTmf8JBXE69",
+	"var_authelia_for_owncloud_desktop_client_secret": "UBntmLjC2yYCeHwsyj73Uwo9TAaecAetRwMw0xYcvNL9yRdLSUi0hUAHfvCHFeFh"
 }

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

@@ -1,4 +1,36 @@
 [
+	{
+		"name": "configuration | compute client secret hash | web",
+		"become": true,
+		"ansible.builtin.shell": {
+			"cmd": "authelia crypto hash generate bcrypt --password {{var_authelia_for_owncloud_web_client_secret}} | cut --delimiter=' ' --fields='2-'"
+		},
+		"register": "temp_authelia_for_owncloud_web_client_secret_hashed"
+	},
+	{
+		"name": "configuration | compute client secret hash | android",
+		"become": true,
+		"ansible.builtin.shell": {
+			"cmd": "authelia crypto hash generate bcrypt --password {{var_authelia_for_owncloud_android_client_secret}} | cut --delimiter=' ' --fields='2-'"
+		},
+		"register": "temp_authelia_for_owncloud_android_client_secret_hashed"
+	},
+	{
+		"name": "configuration | compute client secret hash | ios",
+		"become": true,
+		"ansible.builtin.shell": {
+			"cmd": "authelia crypto hash generate bcrypt --password {{var_authelia_for_owncloud_ios_client_secret}} | cut --delimiter=' ' --fields='2-'"
+		},
+		"register": "temp_authelia_for_owncloud_ios_client_secret_hashed"
+	},
+	{
+		"name": "configuration | compute client secret hash | desktop",
+		"become": true,
+		"ansible.builtin.shell": {
+			"cmd": "authelia crypto hash generate bcrypt --password {{var_authelia_for_owncloud_desktop_client_secret}} | cut --delimiter=' ' --fields='2-'"
+		},
+		"register": "temp_authelia_for_owncloud_desktop_client_secret_hashed"
+	},
 	{
 		"name": "configuration | emplace",
 		"become": true,

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

@@ -1,6 +1,6 @@
 {
 	"client_id": "{{var_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",
 	"authorization_policy": "one_factor",
 	"scopes": [
@@ -10,6 +10,9 @@
 		"email",
 		"offline_access"
 	],
+	"response_types": [
+		"code"
+	],
 	"redirect_uris": [
 		"oc://android.owncloud.com"
 	]

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

@@ -1,6 +1,6 @@
 {
-	"client_id": "xdXOt13JKxym1B1QcEncf2XDkLAexMBFwiT9j6EfhhHFJhs2KM9jbjTmf8JBXE69",
-	"client_secret": "UBntmLjC2yYCeHwsyj73Uwo9TAaecAetRwMw0xYcvNL9yRdLSUi0hUAHfvCHFeFh",
+	"client_id": "{{var_authelia_for_owncloud_desktop_client_id}}",
+	"client_secret": "{{temp_authelia_for_owncloud_desktop_client_secret_hashed.stdout}}",
 	"client_name": "ownCloud | Desktop Client",
 	"authorization_policy": "one_factor",
 	"scopes": [
@@ -10,6 +10,9 @@
 		"email",
 		"offline_access"
 	],
+	"response_types": [
+		"code"
+	],
 	"redirect_uris": [
 		"http://127.0.0.1",
 		"http://localhost"

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

@@ -1,6 +1,6 @@
 {
 	"client_id": "{{var_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",
 	"authorization_policy": "one_factor",
 	"scopes": [
@@ -10,6 +10,9 @@
 		"email",
 		"offline_access"
 	],
+	"response_types": [
+		"code"
+	],
 	"redirect_uris": [
 		"oc://ios.owncloud.com",
 		"oc.ios://ios.owncloud.com"

roles/authelia-for-owncloud/vardef.json

@@ -13,13 +13,21 @@
 	},
 	"android_client_secret": {
 		"type": "string",
-		"mandatory": false
+		"mandatory": true
 	},
 	"ios_client_id": {
 		"type": "string",
 		"mandatory": false
 	},
 	"ios_client_secret": {
+		"type": "string",
+		"mandatory": true
+	},
+	"dektop_client_id": {
+		"type": "string",
+		"mandatory": false
+	},
+	"desktop_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

@@ -0,0 +1,33 @@
+[
+	{
+		"name": "configuration | compute client secret hash",
+		"become": true,
+		"ansible.builtin.shell": {
+			"cmd": "authelia crypto hash generate bcrypt --password {{var_authelia_for_tandoor_client_secret}} | cut --delimiter=' ' --fields='2-'"
+		},
+		"register": "temp_authelia_for_tandoor_client_secret_hashed"
+	},
+	{
+		"name": "configuration | emplace",
+		"become": true,
+		"ansible.builtin.template": {
+			"src": "authelia-client-conf.json.j2",
+			"dest": "/etc/authelia/conf.d/clients/tandoor.json"
+		}
+	},
+	{
+		"name": "configuration | apply",
+		"become": true,
+		"ansible.builtin.command": {
+			"cmd": "/usr/bin/authelia-conf-compose"
+		}
+	},
+	{
+		"name": "restart service",
+		"become": true,
+		"ansible.builtin.systemd_service": {
+			"state": "restarted",
+			"name": "authelia"
+		}
+	}
+]

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/templates/conf-main.json.j2

@@ -173,8 +173,7 @@
 {% endif %}
 {% if var_authelia_notification_mode == "smtp" %}
 		"smtp": {
-			"host": "{{var_authelia_notification_smtp_host}}",
-			"port": {{var_authelia_notification_smtp_port | string}},
+			"address": "{{var_authelia_notification_smtp_host}}:{{var_authelia_notification_smtp_port | string}}",
 			"username": "{{var_authelia_notification_smtp_username}}",
 			"password": "{{var_authelia_notification_smtp_password}}",
 			"sender": "{{var_authelia_notification_smtp_sender}}",
@@ -189,7 +188,12 @@
 	"identity_providers": {
 		"oidc": {
 			"hmac_secret": "{{var_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}}",
 				"refresh_token": "{{var_authelia_oidc_lifespan_refresh_token}}"

roles/hedgedoc/defaults/main.json

@@ -11,7 +11,7 @@
 	"var_hedgedoc_database_data_postgresql_password": "REPLACE_ME",
 	"var_hedgedoc_database_data_postgresql_schema": "hedgedoc",
 	"var_hedgedoc_domain": "hedgedoc.example.org",
-	"var_hedgedoc_authentication_kind": "authelia",
+	"var_hedgedoc_authentication_kind": "internal",
 	"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",

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

@@ -0,0 +1,50 @@
+[
+	{
+		"name": "packages",
+		"become": true,
+		"ansible.builtin.apt": {
+			"update_cache": true,
+			"pkg": [
+				"acl",
+				"python3-psycopg2",
+				"libpq-dev"
+			]
+		}
+	},
+	{
+		"name": "user",
+		"become": true,
+		"become_user": "postgres",
+		"community.postgresql.postgresql_user": {
+			"state": "present",
+			"name": "{{var_postgresql_for_tandoor_username}}",
+			"password": "{{var_postgresql_for_tandoor_password}}"
+		},
+		"environment": {
+			"PGOPTIONS": "-c password_encryption=scram-sha-256"
+		}
+	},
+	{
+		"name": "schema",
+		"become": true,
+		"become_user": "postgres",
+		"community.postgresql.postgresql_db": {
+			"state": "present",
+			"name": "{{var_postgresql_for_tandoor_schema}}",
+			"owner": "{{var_postgresql_for_tandoor_username}}"
+		}
+	},
+	{
+		"name": "rights",
+		"become": true,
+		"become_user": "postgres",
+		"community.postgresql.postgresql_privs": {
+			"state": "present",
+			"db": "{{var_postgresql_for_tandoor_schema}}",
+			"objs": "ALL_IN_SCHEMA",
+			"roles": "{{var_postgresql_for_tandoor_username}}",
+			"privs": "ALL",
+			"grant_option": true
+		}
+	}
+]

roles/synapse/defaults/main.json

@@ -24,6 +24,7 @@
 	"var_synapse_smtp_port": 587,
 	"var_synapse_smtp_username": "synapse@smtp.example.org",
 	"var_synapse_smtp_password": "REPLACE_ME",
+	"var_synapse_notifications_source_address": "synapse@example.org",
 	"var_synapse_notifications_via_email_enabled_by_default": false,
 	"var_synapse_notifications_via_email_delay": "1h",
 	"var_synapse_admin_user_define": true,

roles/synapse/info.md

@@ -1,6 +1,6 @@
 ## Beschreibung
 
-Zur Einrichtung des [matrix.org](https://matrix.org/)-Servers Synapse
+Zur Einrichtung des [matrix.org](https://matrix.org/)-Servers [Synapse](https://github.com/element-hq/synapse)
 
 
 ## Verweise

roles/synapse/tasks/main.json

@@ -7,6 +7,13 @@
 			"dest": "/etc/apt/sources.list.d/bullseye-backports-for-synapse.list"
 		}
 	},
+	{
+		"name": "update sources",
+		"become": true,
+		"ansible.builtin.apt": {
+			"update_cache": true
+		}
+	},
 	{
 		"name": "prepare package installation | server-name",
 		"become": true,

roles/synapse/templates/homeserver.yaml.j2

@@ -170,7 +170,7 @@ email:
   smtp_user: "{{var_synapse_smtp_username}}"
   smtp_pass: "{{var_synapse_smtp_password}}"
   require_transport_security: true
-  notif_from: "%(app)s | {{var_synapse_title}}"
+  notif_from: "%(app)s | {{var_synapse_title}} <{{var_synapse_notifications_source_address}}>"
   enable_notifs: true
   notif_for_new_users: {{var_synapse_notifications_via_email_enabled_by_default | to_yaml}}
   notif_delay_before_mail: {{var_synapse_notifications_via_email_delay}}

roles/synapse/vardef.json

@@ -110,6 +110,10 @@
 		"type": "string",
 		"mandatory": true
 	},
+	"notifications_source_address": {
+		"type": "string",
+		"mandatory": false
+	},
 	"notifications_via_email_enabled_by_default": {
 		"type": "boolean",
 		"mandatory": false

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

@@ -0,0 +1,5 @@
+{
+	"var_tandoor_and_nginx_domain": "tandoor.example.org",
+	"var_tandoor_and_nginx_tls_mode": "force",
+	"var_tandoor_and_nginx_directory": "/opt/tandoor"
+}

roles/tandoor-and-nginx/info.md

@@ -0,0 +1,4 @@
+## Verweise
+
+- [Tandoor-Dokumentation | nginx](https://docs.tandoor.dev/install/manual/#nginx)
+

roles/tandoor-and-nginx/tasks/main.json

@@ -0,0 +1,35 @@
+[
+	{
+		"name": "deactivate default site",
+		"become": true,
+		"ansible.builtin.file": {
+			"state": "absent",
+			"dest": "/etc/nginx/sites-enabled/default"
+		}
+	},
+	{
+		"name": "emplace configuration | data",
+		"become": true,
+		"ansible.builtin.template": {
+			"src": "conf.j2",
+			"dest": "/etc/nginx/sites-available/{{var_tandoor_and_nginx_domain}}"
+		}
+	},
+	{
+		"name": "emplace configuration | link",
+		"become": true,
+		"ansible.builtin.file": {
+			"state": "link",
+			"src": "/etc/nginx/sites-available/{{var_tandoor_and_nginx_domain}}",
+			"dest": "/etc/nginx/sites-enabled/{{var_tandoor_and_nginx_domain}}"
+		}
+	},
+	{
+		"name": "restart nginx",
+		"become": true,
+		"ansible.builtin.systemd_service": {
+			"state": "restarted",
+			"name": "nginx"
+		}
+	}
+]

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

@@ -0,0 +1,43 @@
+{% macro tandoor_common() %}
+	location /static {
+		alias {{var_tandoor_and_nginx_directory}}/program/staticfiles;
+	}
+	
+	location /media {
+		alias {{var_tandoor_and_nginx_directory}}/program/mediafiles;
+	}
+	
+	location / {
+		proxy_set_header Host $http_host;
+		proxy_pass http://unix:{{var_tandoor_and_nginx_directory}}/program/recipes.sock;
+		proxy_set_header X-Forwarded-Proto $scheme;
+	}
+{% endmacro %}
+
+server {
+	listen 80;
+	listen [::]:80;
+	
+	server_name {{var_tandoor_and_nginx_domain}};
+	
+{% if var_tandoor_and_nginx_tls_mode == 'force' %}
+	return 301 https://$http_host$request_uri;
+{% else %}
+{{ tandoor_common() }}
+{% endif %}
+}
+
+{% if var_tandoor_and_nginx_tls_mode != 'disable' %}
+server {
+	listen 443 ssl;
+	listen [::]:443 ssl;
+	
+	server_name {{var_tandoor_and_nginx_domain}};
+	
+	ssl_certificate_key /etc/ssl/private/{{var_tandoor_and_nginx_domain}}.pem;
+	ssl_certificate /etc/ssl/fullchains/{{var_tandoor_and_nginx_domain}}.pem;
+	include /etc/nginx/ssl-hardening.conf;
+	
+{{ tandoor_common() }}
+}
+{% endif %}

roles/tandoor-and-nginx/vardef.json

@@ -0,0 +1,19 @@
+{
+	"domain": {
+		"mandatory": false,
+		"type": "string"
+	},
+	"port": {
+		"mandatory": false,
+		"type": "integer"
+	},
+	"tls_mode": {
+		"mandatory": false,
+		"type": "string",
+		"options": [
+			"disable",
+			"enable",
+			"force"
+		]
+	}
+}

roles/tandoor/defaults/main.json

@@ -0,0 +1,27 @@
+{
+	"var_tandoor_user": "tandoor",
+	"var_tandoor_directory": "/opt/tandoor",
+	"var_tandoor_repository_url": "https://github.com/vabene1111/recipes.git",
+	"var_tandoor_repository_reference": "master",
+	"var_tandoor_database_kind": "sqlite",
+	"var_tandoor_database_data_postgresql_host": "postgresql.example.org",
+	"var_tandoor_database_data_postgresql_port": 5432,
+	"var_tandoor_database_data_postgresql_username": "tandoor_user",
+	"var_tandoor_database_data_postgresql_password": "REPLACE_ME",
+	"var_tandoor_database_data_postgresql_schema": "tandoor",
+	"var_tandoor_authentication_kind": "internal",
+	"var_tandoor_authentication_data_authelia_client_id": "REPLACE_ME",
+	"var_tandoor_authentication_data_authelia_client_secret": "REPLACE_ME",
+	"var_tandoor_authentication_data_authelia_url_base": "https://authelia.example.org",
+	"var_tandoor_authentication_data_authelia_label": "Authelia",
+	"var_tandoor_smtp_host": "smtp.example.org",
+	"var_tandoor_smtp_port": 587,
+	"var_tandoor_smtp_username": "tandoor@smtp.example.org",
+	"var_tandoor_smtp_password": "REPLACE_ME",
+	"var_tandoor_notification_sender": "notification@tandoor.example.org",
+	"var_tandoor_secret_key": "REPLACE_ME",
+	"var_tandoor_admin_username": "admin",
+	"var_tandoor_admin_password": "REPLACE_ME",
+	"var_tandoor_admin_email": "admin@tandoor.example.org",
+	"var_tandoor_domain": "tandoor.exmaple.org"
+}

roles/tandoor/info.md

@@ -0,0 +1,18 @@
+## Beschreibung
+
+Für Rezepte-Sammlung [Tandoor](https://tandoor.dev/)
+
+
+## Verweise
+
+- [Tandoor-Dokumentation | Installation](https://docs.tandoor.dev/install/manual/)
+- [Tandoor-Dokumentation | Konfiguration](https://docs.tandoor.dev/system/configuration/)
+- [Tandoor-Dokumentation | Allauth](https://docs.tandoor.dev/features/authentication/#allauth)
+- [Django-Dokumentation | Variable `DJANGO_SUPERUSER_PASSWORD`](https://docs.djangoproject.com/en/5.1/ref/django-admin/#envvar-DJANGO_SUPERUSER_PASSWORD)
+- [allauth-Dokumentation | OpenID Connect](https://docs.allauth.org/en/latest/socialaccount/providers/openid_connect.html)
+- [allauth-Dokumentation | Authelia](https://docs.allauth.org/en/latest/socialaccount/providers/authelia.html)
+
+
+## ToDo
+
+- Idempotenz

roles/tandoor/tasks/main.json

@@ -0,0 +1,136 @@
+[
+	{
+		"name": "packages",
+		"become": true,
+		"ansible.builtin.apt": {
+			"update_cache": true,
+			"pkg": [
+				"git",
+				"gcc",
+				"libpq-dev",
+				"libldap2-dev",
+				"libsasl2-dev",
+				"python3-venv",
+				"python3-dev",
+				"nodejs",
+				"yarnpkg"
+			]
+		}
+	},
+	{
+		"name": "user and directory",
+		"become": true,
+		"ansible.builtin.user": {
+			"name": "{{var_tandoor_user}}",
+			"create_home": true,
+			"home": "{{var_tandoor_directory}}"
+		}
+	},
+	{
+		"name": "sources",
+		"become": true,
+		"become_user": "{{var_tandoor_user}}",
+		"ansible.builtin.git": {
+			"repo": "{{var_tandoor_repository_url}}",
+			"version": "{{var_tandoor_repository_reference}}",
+			"single_branch": true,
+			"dest": "{{var_tandoor_directory}}/program",
+			"force": true
+		}
+	},
+	{
+		"name": "venv",
+		"become": true,
+		"become_user": "{{var_tandoor_user}}",
+		"ansible.builtin.command": {
+			"chdir": "{{var_tandoor_directory}}",
+			"cmd": "python3 -m venv program"
+		}
+	},
+	{
+		"name": "python requirements",
+		"become": true,
+		"become_user": "{{var_tandoor_user}}",
+		"ansible.builtin.pip": {
+			"virtualenv": "{{var_tandoor_directory}}/program",
+			"virtualenv_python": "python3",
+			"requirements": "{{var_tandoor_directory}}/program/requirements.txt"
+		}
+	},
+	{
+		"name": "configuration",
+		"become": true,
+		"become_user": "{{var_tandoor_user}}",
+		"ansible.builtin.template": {
+			"src": "conf.j2",
+			"dest": "{{var_tandoor_directory}}/program/.env",
+			"mode": "644"
+		}
+	},
+	{
+		"name": "initialize",
+		"become": true,
+		"become_user": "{{var_tandoor_user}}",
+		"environment": {
+			"VIRTUAL_ENV": "{{var_tandoor_directory}}/program"
+		},
+		"loop": [
+			"migrate",
+			"collectstatic --no-input",
+			"collectstatic_js_reverse"
+		],
+		"ansible.builtin.shell": {
+			"chdir": "{{var_tandoor_directory}}/program",
+			"cmd": "bin/python3 manage.py {{item}}"
+		}
+	},
+	{
+		"name": "admin account",
+		"become": true,
+		"become_user": "{{var_tandoor_user}}",
+		"environment": {
+			"VIRTUAL_ENV": "{{var_tandoor_directory}}/program"
+		},
+		"ansible.builtin.shell": {
+			"chdir": "{{var_tandoor_directory}}/program",
+			"cmd": "DJANGO_SUPERUSER_PASSWORD={{var_tandoor_admin_password}} bin/python3 manage.py createsuperuser --no-input --username {{var_tandoor_admin_username}} --email {{var_tandoor_admin_email}}"
+		}
+	},
+
+	{
+		"name": "frontend stuff | core",
+		"become": true,
+		"become_user": "{{var_tandoor_user}}",
+		"ansible.builtin.shell": {
+			"chdir": "{{var_tandoor_directory}}/program/vue",
+			"cmd": "yarnpkg install && yarnpkg build"
+		}
+	},
+	{
+		"name": "frontend stuff | link",
+		"become": true,
+		"become_user": "{{var_tandoor_user}}",
+		"ansible.builtin.file": {
+			"type": "link",
+			"src": "{{var_tandoor_directory}}/program/cookbook/static/vue",
+			"dest": "{{var_tandoor_directory}}/program/staticfiles/vue",
+		}
+	},
+	{
+		"name": "systemd unit",
+		"become": true,
+		"ansible.builtin.template": {
+			"src": "systemd-unit.j2",
+			"dest": "/etc/systemd/system/tandoor.service"
+		}
+	},
+	{
+		"name": "start",
+		"become": true,
+		"ansible.builtin.systemd_service": {
+			"enabled": true,
+			"state": "started",
+			"name": "tandoor"
+		}
+	}
+]

roles/tandoor/templates/conf.j2

@@ -0,0 +1,42 @@
+{% if var_tandoor_database_kind == 'sqlite' %}
+DB_ENGINE=django.db.backends.sqlite3
+{% endif %}
+
+{% if var_tandoor_database_kind == 'postgresql' %}
+DB_ENGINE=django.db.backends.postgresql
+POSTGRES_HOST={{var_tandoor_database_data_postgresql_host}}
+POSTGRES_DB={{var_tandoor_database_data_postgresql_schema}}
+POSTGRES_PORT={{var_tandoor_database_data_postgresql_port | string}}
+POSTGRES_USER={{var_tandoor_database_data_postgresql_username}}
+POSTGRES_PASSWORD={{var_tandoor_database_data_postgresql_password}}
+{% endif %}
+
+{% if var_tandoor_authentication_kind == 'internal' %}
+ENABLE_SIGNUP=1
+REMOTE_USER_AUTH=0
+{% endif %}
+
+{% if var_tandoor_authentication_kind == 'authelia' %}
+ENABLE_SIGNUP=0
+REMOTE_USER_AUTH=1
+SOCIAL_PROVIDERS=allauth.socialaccount.providers.openid
+# SOCIALACCOUNT_PROVIDERS={"openid_connect": {"OAUTH_PKCE_ENABLED": false, "APPS": [{"provider_id": "authelia", "name": "{{var_tandoor_authentication_data_authelia_label}}", "client_id": "{{var_tandoor_authentication_data_authelia_client_id}}", "secret": "{{var_tandoor_authentication_data_authelia_client_secret}}", "settings": {"server_url":"{{var_tandoor_authentication_data_authelia_url_base}}", "token_auth_method": "client_secret_basic", "oauth_pkce_enabled": false}}]}}
+SOCIALACCOUNT_PROVIDERS={"openid_connect": {"APPS": [{"provider_id": "authelia", "name": "{{var_tandoor_authentication_data_authelia_label}}", "client_id": "{{var_tandoor_authentication_data_authelia_client_id}}", "secret": "{{var_tandoor_authentication_data_authelia_client_secret}}", "settings": {"server_url": "{{var_tandoor_authentication_data_authelia_url_base}}/.well-known/openid-configuration"}}]}}
+{% endif %}
+
+EMAIL_HOST={{var_tandoor_smtp_host}}
+EMAIL_PORT={{var_tandoor_smtp_port | string}}
+EMAIL_HOST_USER={{var_tandoor_smtp_username}}
+EMAIL_HOST_PASSWORD={{var_tandoor_smtp_password}}
+EMAIL_USE_TLS=1
+EMAIL_USE_SSL=0
+DEFAULT_FROM_EMAIL={{var_tandoor_notification_sender}}
+
+SECRET_KEY={{var_tandoor_secret_key}}
+
+ALLOWED_HOSTS={{var_tandoor_domain}}
+
+ENABLE_METRICS=0
+ENABLE_PDF_EXPORT=0
+
+DEBUG=0

roles/tandoor/templates/systemd-unit.j2

@@ -0,0 +1,16 @@
+[Unit]
+Description=Tandoor (gunicorn daemon)
+After=network.target
+
+[Service]
+Type=simple
+Restart=always
+RestartSec=3
+User={{var_tandoor_user}}
+Group=www-data
+WorkingDirectory={{var_tandoor_directory}}/program
+EnvironmentFile={{var_tandoor_directory}}/program/.env
+ExecStart={{var_tandoor_directory}}/program/bin/gunicorn --capture-output --bind unix:{{var_tandoor_directory}}/program/recipes.sock recipes.wsgi:application
+
+[Install]
+WantedBy=multi-user.target

roles/wiki_js/files/wiki-js-cli

@@ -288,7 +288,7 @@ var _wiki_js_cli;
          */
         async function call_finalize(admin_email, admin_password, site_url, telemetry) {
             const http_request = {
-                "target": (_wiki_js_cli.conf.get().api.url_base + "/finalize"),
+                "target": (_url_base + "/finalize"),
                 "method": "POST",
                 "headers": {
                     "Content-Type": "application/json",

roles/wiki_js/tasks/main.json

@@ -55,7 +55,8 @@
 		"ansible.builtin.copy": {
 			"src": "wiki-js-cli",
 			"dest": "/usr/local/bin/wiki-js-cli",
-			"mode": "0700"
+			"owner": "{{var_wiki_js_user}}",
+			"mode": "0770"
 		}
 	},
 	{
@@ -129,7 +130,7 @@
 		"become_user": "{{var_wiki_js_user}}",
 		"ansible.builtin.command": {
 			"chdir": "{{var_wiki_js_directory}}",
-			"cmd": "/usr/local/bin/wiki-js-cli -b http://127.0.0.1:{{var_wiki_js_port | string}} -u {{var_wiki_js_admin_email_address}} -p {{var_wiki_js_admin_password}} email-settings-set {{var_wiki_js_smtp_host}} {{var_wiki_js_smtp_port}} {{var_wiki_js_smtp_username}} {{var_wiki_js_smtp_password}} {{email_sending_sender_name}} {{email_sending_sender_email_address}}"
+			"cmd": "/usr/local/bin/wiki-js-cli -b http://127.0.0.1:{{var_wiki_js_port | string}} -u {{var_wiki_js_admin_email_address}} -p {{var_wiki_js_admin_password}} email-settings-set {{var_wiki_js_smtp_host}} {{var_wiki_js_smtp_port}} {{var_wiki_js_smtp_username}} {{var_wiki_js_smtp_password}} {{var_wiki_js_email_sending_sender_name}} {{var_wiki_js_email_sending_sender_email_address}}"
 		}
 	},
 	{
@@ -143,23 +144,13 @@
 		}
 	},
 	{
-		"name": "setup | set guest access | negative",
-		"when": "not var_wiki_js_allow_guest_view",
-		"become": true,
-		"become_user": "{{var_wiki_js_user}}",
-		"ansible.builtin.command": {
-			"chdir": "{{var_wiki_js_directory}}",
-			"cmd": "/usr/local/bin/wiki-js-cli -b http://127.0.0.1:{{var_wiki_js_port | string}} -u {{var_wiki_js_admin_email_address}} -p {{var_wiki_js_admin_password}} group-modify Guests"
-		}
-	},
-	{
-		"name": "setup | set guest access | positive",
+		"name": "setup | set guest access",
 		"when": "var_wiki_js_allow_guest_view",
 		"become": true,
 		"become_user": "{{var_wiki_js_user}}",
 		"ansible.builtin.command": {
 			"chdir": "{{var_wiki_js_directory}}",
-			"cmd": "/usr/local/bin/wiki-js-cli -b http://127.0.0.1:{{var_wiki_js_port | string}} -u {{var_wiki_js_admin_email_address}} -p {{var_wiki_js_admin_password}} group-modify Guests read:pages read:assets read:comments"
+			"cmd": "/usr/local/bin/wiki-js-cli -b http://127.0.0.1:{{var_wiki_js_port | string}} -u {{var_wiki_js_admin_email_address}} -p {{var_wiki_js_admin_password}} group-modify Guests {{var_wiki_js_allow_guest_view | ternary('read:pages,read:assets,read:comments,write:comments,write:pages,manage:pages,delete:pages,write:styles,write:scripts,read:source,read:history,write:assets,manage:assets,manage:comments','')}}"
 		}
 	},
 	{
@@ -168,7 +159,7 @@
 		"become_user": "{{var_wiki_js_user}}",
 		"ansible.builtin.command": {
 			"chdir": "{{var_wiki_js_directory}}",
-			"cmd": "/usr/local/bin/wiki-js-cli -b http://127.0.0.1:{{var_wiki_js_port | string}} -u {{var_wiki_js_admin_email_address}} -p {{var_wiki_js_admin_password}} group-add {{var_wiki_js_user_group_name}} {{var_wiki_js_allow_guest_view | ternary('read:pages,read:assets,read:comments,write:comments,write:pages,manage:pages,delete:pages,write:styles,write:scripts,read:source,read:history,write:assets,manage:assets,manage:comments','')}}"
+			"cmd": "/usr/local/bin/wiki-js-cli -b http://127.0.0.1:{{var_wiki_js_port | string}} -u {{var_wiki_js_admin_email_address}} -p {{var_wiki_js_admin_password}} group-add {{var_wiki_js_user_group_name}} 'read:pages,read:assets,read:comments,write:comments,write:pages,manage:pages,delete:pages,write:styles,write:scripts,read:source,read:history,write:assets,manage:assets,manage:comments'"
 		}
 	},
 	{