From 4319326513d21b8c4a44b55dfe44e2124bb07fb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Fra=C3=9F?=
 <christian.frass@dielinke-glauchau.de>
Date: Mon, 30 Dec 2024 14:55:58 +0100
Subject: [PATCH] [task-230] [mod] install path

---
 roles/tandoor/tasks/main.json           | 16 ++++++++--------
 roles/tandoor/templates/systemd-unit.j2 |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/roles/tandoor/tasks/main.json b/roles/tandoor/tasks/main.json
index 6cf3b5d..bf34ddf 100644
--- a/roles/tandoor/tasks/main.json
+++ b/roles/tandoor/tasks/main.json
@@ -27,41 +27,41 @@
 		"ansible.builtin.git": {
 			"repo": "{{var_tandoor_repository_url}}",
 			"version": "{{var_tandoor_repository_reference}}",
-			"dest": "{{var_tandoor_directory}}"
+			"dest": "{{var_tandoor_directory}}/program"
 		}
 	},
 	{
 		"name": "python requirements",
 		"ansible.builtin.pip": {
-			"virtualenv": "{{var_tandoor_directory}}",
-			"requirements": "{{var_tandoor_directory}}/requirements.txt"
+			"virtualenv": "{{var_tandoor_directory}}/program",
+			"requirements": "{{var_tandoor_directory}}/program/requirements.txt"
 		}
 	},
 	{
 		"name": "database",
 		"ansible.builtin.shell": {
-			"environment": "VIRTUAL_ENV={{var_tandoor_directory}}",
+			"environment": "VIRTUAL_ENV={{var_tandoor_directory}}/program",
 			"cmd": "bin/python3 manage.py migrate"
 		}
 	},
 	{
 		"name": "static files",
 		"ansible.builtin.shell": {
-			"environment": "VIRTUAL_ENV={{var_tandoor_directory}}",
+			"environment": "VIRTUAL_ENV={{var_tandoor_directory}}/program",
 			"cmd": "bin/python3 manage.py collectstatic --no-input"
 		}
 	},
 	{
 		"name": "static files",
 		"ansible.builtin.shell": {
-			"environment": "VIRTUAL_ENV={{var_tandoor_directory}}",
+			"environment": "VIRTUAL_ENV={{var_tandoor_directory}}/program",
 			"cmd": "bin/python3 manage.py collectstatic_js_reverse"
 		}
 	},
 	{
 		"name": "frontend stuff",
 		"ansible.builtin.shell": {
-			"chdir": "{{var_tandoor_directory}}/vue",
+			"chdir": "{{var_tandoor_directory}}/program/vue",
 			"cmd": "yarn install && yarn build"
 		}
 	},
@@ -69,7 +69,7 @@
 		"name": "configuration",
 		"ansible.builtin.template": {
 			"src": "conf.j2",
-			"dest": "{{var_tandoor_directory}}/.env"
+			"dest": "{{var_tandoor_directory}}/program/.env"
 		}
 	},
 	{
diff --git a/roles/tandoor/templates/systemd-unit.j2 b/roles/tandoor/templates/systemd-unit.j2
index 03a79bd..ca1ec13 100644
--- a/roles/tandoor/templates/systemd-unit.j2
+++ b/roles/tandoor/templates/systemd-unit.j2
@@ -3,10 +3,10 @@ Description=Tandoor
 After=multi-user.target
 
 [Service]
-WorkingDirectory={{var_tandoor_directory}}
+WorkingDirectory={{var_tandoor_directory}}/program
 User={{var_tandoor_user}}
-# Environment="VIRTUAL_ENV={{var_tandoor_directory}}"
-ExecStart="{{var_tandoor_directory}}/bin/python3 manage.py runserver"
+# Environment="VIRTUAL_ENV={{var_tandoor_directory}}/program"
+ExecStart="{{var_tandoor_directory}}/program/bin/python3 manage.py runserver"
 SyslogIdentifier=tandoor
 
 [Install]