From 0d4a51564c963f2a76aab8c8dc2668852ed30686 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Fra=C3=9F?= <frass@greenscale.de>
Date: Sun, 17 Dec 2023 11:12:47 +0100
Subject: [PATCH] =?UTF-8?q?[mod]=20role:hedgedoc:Parameter=20f=C3=BCr=20Nu?=
 =?UTF-8?q?tzer-Name=20und=20Verzeichnis?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ansible/roles/hedgedoc/defaults/main.json        |  2 ++
 ansible/roles/hedgedoc/tasks/main.json           | 14 +++++++-------
 ansible/roles/hedgedoc/templates/systemd-unit.j2 |  5 +++--
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/ansible/roles/hedgedoc/defaults/main.json b/ansible/roles/hedgedoc/defaults/main.json
index b7e9a3c..a1c03ed 100644
--- a/ansible/roles/hedgedoc/defaults/main.json
+++ b/ansible/roles/hedgedoc/defaults/main.json
@@ -1,4 +1,6 @@
 {
+	"var_hedgedoc_user_name": "hedgedoc",
+	"var_hedgedoc_directory": "/opt/hedgedoc",
 	"var_hedgedoc_version": "1.9.9",
 	"var_hedgedoc_session_secret": "session_secret",
 	"var_hedgedoc_database_path": "/var/hedgedoc/data.sqlite",
diff --git a/ansible/roles/hedgedoc/tasks/main.json b/ansible/roles/hedgedoc/tasks/main.json
index 193af87..984e44d 100644
--- a/ansible/roles/hedgedoc/tasks/main.json
+++ b/ansible/roles/hedgedoc/tasks/main.json
@@ -25,7 +25,7 @@
 		"name": "user",
 		"become": true,
 		"ansible.builtin.user": {
-			"name": "hedgedoc",
+			"name": "{{var_hedgedoc_user_name}}",
 			"create_home": true
 		}
 	},
@@ -43,8 +43,8 @@
 		"ansible.builtin.unarchive": {
 			"remote_src": true,
 			"src": "/tmp/hedgedoc.tar.gz",
-			"dest": "/opt",
-			"owner": "hedgedoc"
+			"dest": "{{var_hedgedoc_directory | dirname}}",
+			"owner": "{{var_hedgedoc_user_name}}"
 		}
 	},
 	{
@@ -52,7 +52,7 @@
 		"become": true,
 		"become_user": "hedgedoc",
 		"ansible.builtin.command": {
-			"chdir": "/opt/hedgedoc",
+			"chdir": "{{var_hedgedoc_directory}}",
 			"cmd": "bin/setup"
 		}
 	},
@@ -62,7 +62,7 @@
 		"ansible.builtin.file": {
 			"state": "directory",
 			"path": "{{var_hedgedoc_database_path | dirname}}",
-			"owner": "hedgedoc"
+			"owner": "{{var_hedgedoc_user_name}}"
 		}
 	},
 	{
@@ -71,7 +71,7 @@
 		"ansible.builtin.file": {
 			"state": "touch",
 			"path": "{{var_hedgedoc_database_path}}",
-			"owner": "hedgedoc"
+			"owner": "{{var_hedgedoc_user_name}}"
 		}
 	},
 	{
@@ -79,7 +79,7 @@
 		"become": true,
 		"ansible.builtin.template": {
 			"src": "config.json.j2",
-			"dest": "/opt/hedgedoc/config.json"
+			"dest": "{{var_hedgedoc_directory}}/config.json"
 		}
 	},
 	{
diff --git a/ansible/roles/hedgedoc/templates/systemd-unit.j2 b/ansible/roles/hedgedoc/templates/systemd-unit.j2
index f2574df..000bd6e 100644
--- a/ansible/roles/hedgedoc/templates/systemd-unit.j2
+++ b/ansible/roles/hedgedoc/templates/systemd-unit.j2
@@ -3,8 +3,9 @@ Description=Hedgedoc
 After=multi-user.target
 
 [Service]
-WorkingDirectory=/opt/hedgedoc
-Environment=NODE_ENV=production
+WorkingDirectory={{var_hedgedoc_directory}}
+User={{var_hedgedoc_user_name}}
+Environment="NODE_ENV=production"
 ExecStart=yarn start
 SyslogIdentifier=hedgedoc