[int]

roles/database/defaults/main.json

@@ -1,5 +0,0 @@
-{
-	"var_linke_espe_database_git_reference": "master",
-	"var_linke_espe_database_revision": "r4",
-	"var_linke_espe_database_backup_path": null
-}

roles/database/tasks/main.json

@@ -1,23 +0,0 @@
-[
-	{
-		"name": "fetch",
-		"delegate_to": "localhost",
-		"ansible.builtin.git": {
-			"repo": "dl-cloud-gitlab:espe/backend",
-			"version": "{{var_linke_espe_database_git_reference}}",
-			"dest": "/tmp/espe-database-repo"
-		}
-	},
-	{
-		"name": "build",
-		"delegate_to": "localhost",
-		"ansible.builtin.command": {
-			"chdir": "/tmp/espe-database-repo",
-			"cmd": "tools/build {{var_linke_espe_database_revision}} > /tmp/espe-db-init.sql"
-		}
-	},
-	{
-		"name": "initialize",
-		"when": "var_linke_espe_database_backup_path == None",
-	}
-]

roles/database/vardef.json

@@ -1,17 +0,0 @@
-{
-	"git_reference": {
-		"nullable": true,
-		"type": "string",
-		"mandatory": false
-	},
-	"revision": {
-		"nullable": false,
-		"type": "string",
-		"mandatory": true
-	},
-	"backup_path": {
-		"nullable": true,
-		"type": "string",
-		"mandatory": false
-	}
-}

roles/espe_backend/defaults/main.json

@@ -1,5 +1,6 @@
 {
 	"var_espe_backend_directory": "/opt/espe/backend",
+	"var_espe_backend_user": "espe",
 	"var_espe_backend_git_reference": "master",
 	"var_espe_backend_verbosity": "notice",
 	"var_espe_backend_verification_secret": "REPLACE_ME",

roles/espe_backend/tasks/main.json

@@ -1,4 +1,13 @@
 [
+	{
+		"name": "user",
+		"become": true,
+		"ansible.builtin.user": {
+			"name": "{{var_espe_backend_user}}",
+			"create_home": true,
+			"home": "{{var_espe_backend_directory}}"
+		}
+	},
 	{
 		"name": "program | fetch",
 		"delegate_to": "localhost",
@@ -26,9 +35,11 @@
 	},
 	{
 		"name": "conf",
+		"become": true,
 		"ansible.builtin.template": {
 			"src": "conf.json.j2",
-			"dest": "{{var_espe_backend_directory}}/conf.json"
+			"dest": "{{var_espe_backend_directory}}/conf.json",
+			"owner": "{{var_espe_backend_user}}"
 		}
 	}
 ]

roles/espe_backend/vardef.json

@@ -3,6 +3,10 @@
 		"type": "string",
 		"mandatory": false
 	},
+	"user": {
+		"type": "string",
+		"mandatory": false
+	},
 	"git_reference": {
 		"type": "string",
 		"mandatory": false

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

@@ -3,5 +3,5 @@
 	"var_postgresql_for_espe_password": "REPLACE_ME",
 	"var_postgresql_for_espe_schema": "espe",
 	"var_postgresql_for_espe_git_reference": "master",
-	"var_postgresql_for_espe_revision": "r4"
+	"var_postgresql_for_espe_revision": "."
 }

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

@@ -45,7 +45,7 @@
 			"privs": "ALL",
 			"grant_option": true
 		}
-	}
+	},
 	{
 		"name": "structure | fetch",
 		"delegate_to": "localhost",
@@ -60,7 +60,7 @@
 		"delegate_to": "localhost",
 		"ansible.builtin.command": {
 			"chdir": "/tmp/espe-datamodel-repo",
-			"cmd": "tools/build {{var_postgresql_for_espe_revision}} database:postgresql > /tmp/espe.sql"
+			"cmd": "tools/build --revision='{{var_postgresql_for_espe_revision}}' --format='postgresql' > /tmp/espe.sql"
 		}
 	},
 	{