From 13c74d4c8f75ebcdb4f544d3032c10c05b5e7ee6 Mon Sep 17 00:00:00 2001
From: DOMjudge team <team@domjudge.org>
Date: Sat, 13 Apr 2024 10:15:26 +0200
Subject: [PATCH 1/2] Use systemd to start domlogo

---
 .../ansible/roles/domlogo/tasks/main.yml       | 15 +++++++++------
 .../domlogo/templates/domjudgelogo.desktop.j2  |  4 ----
 .../roles/domlogo/templates/domlogo.service.j2 | 18 ++++++++++++++++++
 3 files changed, 27 insertions(+), 10 deletions(-)
 delete mode 100644 provision-contest/ansible/roles/domlogo/templates/domjudgelogo.desktop.j2
 create mode 100644 provision-contest/ansible/roles/domlogo/templates/domlogo.service.j2

diff --git a/provision-contest/ansible/roles/domlogo/tasks/main.yml b/provision-contest/ansible/roles/domlogo/tasks/main.yml
index 705db5d8..f5811239 100644
--- a/provision-contest/ansible/roles/domlogo/tasks/main.yml
+++ b/provision-contest/ansible/roles/domlogo/tasks/main.yml
@@ -44,10 +44,13 @@
     owner: domjudge
     group: domjudge
 
-- name: Add autostart shortcuts
+- name: Copy domlogo systemd unit file
   template:
-    src: "domjudgelogo.desktop.j2"
-    dest: "/home/domjudge/.config/autostart/domjudgelogo.desktop"
-    owner: domjudge
-    group: domjudge
-    mode: 0755
+    src: "domlogo.service.j2"
+    dest: "/etc/systemd/system/domlogo.service"
+
+- name: Enable and start domlogo
+  systemd:
+    name: domlogo
+    enabled: true
+    state: started
\ No newline at end of file
diff --git a/provision-contest/ansible/roles/domlogo/templates/domjudgelogo.desktop.j2 b/provision-contest/ansible/roles/domlogo/templates/domjudgelogo.desktop.j2
deleted file mode 100644
index 03e4e0bc..00000000
--- a/provision-contest/ansible/roles/domlogo/templates/domjudgelogo.desktop.j2
+++ /dev/null
@@ -1,4 +0,0 @@
-[Desktop Entry]
-Name=domjudgelogo
-Type=Application
-Exec=bash -c "sleep 10 && cd {{ DJ_DIR }} && while true; do python3 ./domlogo.py 1>>/home/domjudge/logo.out 2>>/home/domjudge/logo.err; sleep 2; done"
diff --git a/provision-contest/ansible/roles/domlogo/templates/domlogo.service.j2 b/provision-contest/ansible/roles/domlogo/templates/domlogo.service.j2
new file mode 100644
index 00000000..98f337db
--- /dev/null
+++ b/provision-contest/ansible/roles/domlogo/templates/domlogo.service.j2
@@ -0,0 +1,18 @@
+[Unit]
+Description="DOMlogo"
+After=network.target
+
+[Service]
+Type=simple
+
+Environment=REQUESTS_CA_BUNDLE=/usr/local/share/ca-certificates/domserver.crt
+Environment=DISPLAY=:0
+WorkingDirectory={{ DJ_DIR }}
+ExecStart=/usr/bin/python3 ./domlogo.py
+User=domjudge
+
+Restart=always
+RestartSec=3
+
+[Install]
+WantedBy=graphical.target

From 95d768355c7dcca4f9816e567d692f1b8e59ba02 Mon Sep 17 00:00:00 2001
From: Tobias Werth <spam-by-github@never-mind.eu>
Date: Sun, 5 May 2024 19:20:23 +0200
Subject: [PATCH 2/2] Update
 provision-contest/ansible/roles/domlogo/templates/domlogo.service.j2

Co-authored-by: MCJ Vasseur <14887731+vmcj@users.noreply.github.com>
---
 .../ansible/roles/domlogo/templates/domlogo.service.j2          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provision-contest/ansible/roles/domlogo/templates/domlogo.service.j2 b/provision-contest/ansible/roles/domlogo/templates/domlogo.service.j2
index 98f337db..71c899e3 100644
--- a/provision-contest/ansible/roles/domlogo/templates/domlogo.service.j2
+++ b/provision-contest/ansible/roles/domlogo/templates/domlogo.service.j2
@@ -8,7 +8,7 @@ Type=simple
 Environment=REQUESTS_CA_BUNDLE=/usr/local/share/ca-certificates/domserver.crt
 Environment=DISPLAY=:0
 WorkingDirectory={{ DJ_DIR }}
-ExecStart=/usr/bin/python3 ./domlogo.py
+ExecStart=domlogo.py
 User=domjudge
 
 Restart=always