From d5cf4f57b3d24a16f46cff1ce7f18db375b06433 Mon Sep 17 00:00:00 2001
From: Fenris Wolf <fenris@folksprak.org>
Date: Thu, 18 Sep 2025 13:44:07 +0200
Subject: [PATCH] [fix]

---
 .../defaults/main.json                        |  1 +
 .../templates/conf.j2                         | 14 ++++++++---
 roles/davina_backend/tasks/main.json          | 25 ++++++-------------
 .../davina_backend/templates/systemd_unit.j2  | 14 -----------
 4 files changed, 20 insertions(+), 34 deletions(-)
 delete mode 100644 roles/davina_backend/templates/systemd_unit.j2

diff --git a/roles/davina_backend-and-nginx/defaults/main.json b/roles/davina_backend-and-nginx/defaults/main.json
index 4c8cf16..9410d1f 100644
--- a/roles/davina_backend-and-nginx/defaults/main.json
+++ b/roles/davina_backend-and-nginx/defaults/main.json
@@ -1,4 +1,5 @@
 {
+	"var_davina_backend_and_nginx_directory": "/opt/davina",
 	"var_davina_backend_and_nginx_domain": "davina.example.org",
 	"var_davina_backend_and_nginx_tls_mode": "force"
 }
diff --git a/roles/davina_backend-and-nginx/templates/conf.j2 b/roles/davina_backend-and-nginx/templates/conf.j2
index 4462369..eccf169 100644
--- a/roles/davina_backend-and-nginx/templates/conf.j2
+++ b/roles/davina_backend-and-nginx/templates/conf.j2
@@ -1,13 +1,21 @@
 {% macro davina_backend_common() %}
+	root {{var_davina_backend_and_nginx_directory}};
+	index index.php;
+	
 	location / {
+		try_files $uri $uri/ /index.php;
+
 		dav_methods PUT DELETE MKCOL COPY MOVE;
 		# dav_ext_methods PROPFIND PROPPATCH LOCK UNLOCK;
-		dav_access user:rw group:rw all:r;
-
+		# dav_access user:rw group:rw all:r;
+		# create_full_put_path on;
+	}
+	
+	location ~ \.php$ {
 		include fastcgi_params;
 		fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
 		fastcgi_param REDIRECT_STATUS 200;
-		fastcgi_pass unix:/var/run/php/php8.2-fpm.sock;
+		fastcgi_pass unix:/var/run/php/php8.4-fpm.sock;
 	}
 {% endmacro %}
 
diff --git a/roles/davina_backend/tasks/main.json b/roles/davina_backend/tasks/main.json
index 4a00bb8..9cc5b43 100644
--- a/roles/davina_backend/tasks/main.json
+++ b/roles/davina_backend/tasks/main.json
@@ -21,6 +21,14 @@
 			"home": "{{var_davina_backend_directory}}"
 		}
 	},
+	{
+		"name": "adjust data directory",
+		"become": true,
+		"ansible.builtin.file": {
+			"group": "www-data",
+			"mode": "g+rwx"
+		}
+	},
 	{
 		"name": "program | fetch",
 		"become": true,
@@ -57,22 +65,5 @@
 			"dest": "{{var_davina_backend_directory}}/conf.json",
 			"owner": "{{var_davina_backend_user}}"
 		}
-	},
-	{
-		"name": "systemd unit",
-		"become": true,
-		"ansible.builtin.template": {
-			"src": "systemd_unit.j2",
-			"dest": "/etc/systemd/system/davina.service"
-		}
-	},
-	{
-		"name": "run",
-		"become": true,
-		"ansible.builtin.systemd_service": {
-			"name": "davina",
-			"enabled": true,
-			"state": "restarted"
-		}
 	}
 ]
diff --git a/roles/davina_backend/templates/systemd_unit.j2 b/roles/davina_backend/templates/systemd_unit.j2
deleted file mode 100644
index 2f50887..0000000
--- a/roles/davina_backend/templates/systemd_unit.j2
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=davina
-After=network.target
-
-[Service]
-WorkingDirectory={{var_davina_backend_directory}}
-ExecStart={{var_davina_backend_directory}}/davina serve
-Type=simple
-Restart=always
-User={{var_davina_backend_user}}
-
-[Install]
-WantedBy=default.target
-RequiredBy=network.target