roles/espe_backend/defaults/main.json

@@ -1,8 +1,7 @@
 {
 	"var_espe_backend_directory": "/opt/espe",
 	"var_espe_backend_user": "espe",
-	"var_espe_backend_git_repository_url": "https://forgejo.linke.sx/espe/backend",
+	"var_espe_backend_git_reference": "master",
-	"var_espe_backend_git_reference": "main",
 	"var_espe_backend_verbosity": "notice",
 	"var_espe_backend_verification_secret": "REPLACE_ME",
 	"var_espe_backend_port": 4916,
@@ -35,5 +34,5 @@
 	"var_espe_backend_name_index_veil": true,
 	"var_espe_backend_name_index_salt": "REPLACE_ME",
 	"var_espe_backend_admins": [],
-	"var_espe_backend_outputs": []
+	"var_espe_backend_output_authelia": null
 }

roles/espe_backend/tasks/main.json

@@ -26,7 +26,7 @@
 		"become": true,
 		"become_user": "{{var_espe_backend_user}}",
 		"ansible.builtin.git": {
-			"repo": "{{var_espe_backend_git_repository_url}}",
+			"repo": "https://gitlab.die-linke.cloud/espe/backend",
 			"version": "{{var_espe_backend_git_reference}}",
 			"dest": "/tmp/espe-backend-repo"
 		}

roles/espe_backend/templates/conf.json.j2

@@ -87,5 +87,7 @@
 		}
 	},
 	"admins": {{var_espe_backend_admins | to_json}},
-	"outputs": {{var_espe_backend_outputs | to_json}}
+	"output": {
+		"authelia": {{var_espe_backend_output_authelia | to_json}}
+	}
 }

roles/espe_backend/vardef.json

@@ -7,10 +7,6 @@
 		"type": "string",
 		"mandatory": false
 	},
-	"git_repository_url": {
-		"type": "string",
-		"mandatory": false
-	},
 	"git_reference": {
 		"type": "string",
 		"mandatory": false
@@ -179,26 +175,8 @@
 		},
 		"mandatory": false
 	},
-	"outputs": {
+	"output_authelia": {
 		"nullable": true,
-		"type": "array",
-		"items": {
-			"nullable": false,
-			"type": "object",
-			"properties": {
-				"kind": {
-					"nullable": false,
 		"type": "string"
-				},
-				"data": {
-					"nullable": true
-				}
-			},
-			"required": [
-				"kind",
-				"data"
-			],
-			"additionalProperties": false
-		}
 	}
 }

roles/espe_frontend_zackeneule/defaults/main.json

@@ -1,8 +1,7 @@
 {
-	"var_espe_frontend_zackeneule_git_repository_url": "https://forgejo.linke.sx/espe/frontend-zackeneule",
+	"var_espe_frontend_zackeneule_git_reference": "master",
-	"var_espe_frontend_zackeneule_git_reference": "main",
 	"var_espe_frontend_zackeneule_directory": "/opt/zackeneule",
-	"var_espe_frontend_zackeneule_user": "zackeneule",
+	"var_espe_frontend_zackeneule_user": "root",
 	"var_espe_frontend_zackeneule_title": "Zackeneule",
 	"var_espe_frontend_zackeneule_backend_scheme": "https",
 	"var_espe_frontend_zackeneule_backend_host": "espe.example.org",

roles/espe_frontend_zackeneule/tasks/main.json

@@ -12,46 +12,38 @@
 		}
 	},
 	{
-		"name": "user and directory",
+		"name": "directory",
 		"become": true,
-		"ansible.builtin.user": {
+		"ansible.builtin.file": {
-			"name": "{{var_espe_frontend_zackeneule_user}}",
+			"state": "directory",
-			"create_home": true,
+			"owner": "{{var_espe_frontend_zackeneule_user}}"
-			"home": "{{var_espe_frontend_zackeneule_directory}}"
 		}
 	},
 	{
 		"name": "program | fetch",
-		"become": true,
-		"become_user": "{{var_espe_frontend_zackeneule_user}}",
 		"ansible.builtin.git": {
-			"repo": "{{var_espe_frontend_zackeneule_git_repository_url}}",
+			"repo": "https://gitlab.die-linke.cloud/espe/frontend",
 			"version": "{{var_espe_frontend_zackeneule_git_reference}}",
-			"dest": "/tmp/zackeneule-repo"
+			"dest": "/tmp/espe-frontend-repo"
 		}
 	},
 	{
 		"name": "program | build",
-		"become": true,
-		"become_user": "{{var_espe_frontend_zackeneule_user}}",
 		"ansible.builtin.command": {
-			"chdir": "/tmp/zackeneule-repo",
+			"chdir": "/tmp/espe-frontend-repo",
 			"cmd": "tools/build"
 		}
 	},
 	{
 		"name": "program | deploy",
 		"become": true,
-		"become_user": "{{var_espe_frontend_zackeneule_user}}",
 		"ansible.builtin.shell": {
-			"chdir": "/tmp/zackeneule-repo",
+			"cmd": "cp --recursive --update /tmp/espe-frontend-repo/build/* {{var_espe_frontend_zackeneule_directory}}/ && chown --recursive {{var_espe_frontend_zackeneule_user}} {{var_espe_frontend_zackeneule_directory}}"
-			"cmd": "tools/deploy localhost --target-directory={{var_espe_frontend_zackeneule_directory}}"
 		}
 	},
 	{
 		"name": "conf",
 		"become": true,
-		"become_user": "{{var_espe_frontend_zackeneule_user}}",
 		"ansible.builtin.template": {
 			"src": "conf.json.j2",
 			"dest": "{{var_espe_frontend_zackeneule_directory}}/conf.json",

roles/espe_frontend_zackeneule/templates/conf.json.j2

@@ -9,7 +9,7 @@
 		"title": "{{var_espe_frontend_zackeneule_title}}",
 		"registration_defaults": {
 			"email_address": "{{var_espe_frontend_zackeneule_registration_default_email_address}}",
-			"email_redirect": {{var_espe_frontend_zackeneule_registration_default_email_redirect | to_json}}
+			"email_redirect": {{var_espe_frontend_zackeneule_registration_default_email_redirect | to_json}}"
 		}
 	}
 }

roles/espe_frontend_zackeneule/vardef.json

@@ -1,8 +1,4 @@
 {
-	"git_repository_url": {
-		"type": "string",
-		"mandatory": false
-	},
 	"git_reference": {
 		"type": "string",
 		"mandatory": false

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

@@ -2,7 +2,6 @@
 	"var_postgresql_for_espe_username": "espe_user",
 	"var_postgresql_for_espe_password": "REPLACE_ME",
 	"var_postgresql_for_espe_schema": "espe",
-	"var_postgresql_for_espe_git_repository_url": "https://forgejo.linke.sx/espe/datamodel",
+	"var_postgresql_for_espe_git_reference": "master",
-	"var_postgresql_for_espe_git_reference": "main",
 	"var_postgresql_for_espe_revision": "."
 }

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

@@ -50,7 +50,7 @@
 		"name": "structure | fetch",
 		"delegate_to": "localhost",
 		"ansible.builtin.git": {
-			"repo": "{{var_postgresql_for_espe_git_repository_url}}",
+			"repo": "dl-cloud-gitlab:espe/datamodel",
 			"version": "{{var_postgresql_for_espe_git_reference}}",
 			"dest": "/tmp/espe-datamodel-repo"
 		}

roles/postgresql-for-espe/vardef.json

@@ -11,10 +11,6 @@
 		"type": "string",
 		"mandatory": false
 	},
-	"git_repository_url": {
-		"type": "string",
-		"mandatory": false
-	},
 	"git_reference": {
 		"type": "string",
 		"mandatory": false