Replace explicit uses of path by DJ_DIR variable.

Author: eldering

icpc-wf/ansible/domserver.yml

@@ -59,11 +59,27 @@
         rsync_path: sudo rsync
 
     - name: Add documentation in DOMjudge team interface
-      copy: src=files/docs.yaml dest=/opt/domjudge/etc/docs.yaml
+      copy:
+        src: files/docs.yaml
+        dest: "{{DJ_DIR}}/etc/"
 
     - name: add autostart shortcuts
-      copy: src=files/{{item}}.desktop dest=/home/domjudge/.config/autostart/ owner=domjudge group=domjudge mode=0755
+      copy:
+        src: files/{{item}}.desktop
+        dest: /home/domjudge/.config/autostart/
+        owner: domjudge
+        group: domjudge
+        mode: 0755
       with_items:
         - htop
         - taillog-domserver-nginx-error
+
+    - name: add autostart shortcuts from template
+      template:
+        src: files/{{item}}.desktop.j2
+        dest: /home/domjudge/.config/autostart/{{item}}.desktop
+        owner: domjudge
+        group: domjudge
+        mode: 0755
+      with_items:
         - taillog-domserver-symfony-error

icpc-wf/ansible/files/taillog-domserver-symfony-error.desktop renamed to icpc-wf/ansible/files/taillog-domserver-symfony-error.desktop.j2

@@ -1,4 +1,4 @@
 [Desktop Entry]
 Name=taillog-domserver-symfony-error
 Type=Application
-Exec=gnome-terminal --window --geometry 74x17+1000+400 -e 'bash -c "tail -F /opt/domjudge/webapp/var/log/prod.log"'
+Exec=gnome-terminal --window --geometry 74x17+1000+400 -e 'bash -c "tail -F {{DJ_DIR}}/webapp/var/log/prod.log"'

icpc-wf/ansible/files/taillog.desktop renamed to icpc-wf/ansible/files/taillog.desktop.j2

@@ -1,4 +1,4 @@
 [Desktop Entry]
 Name=taillog
 Type=Application
-Exec=gnome-terminal --window --full-screen -e 'bash -c "tail -f /opt/domjudge/output/log/*-0.log"'
+Exec=gnome-terminal --window --full-screen -e 'bash -c "tail -f {{DJ_DIR}}/output/log/*-0.log"'

icpc-wf/ansible/judgehost.yml

@@ -33,7 +33,21 @@
       delegate_to: localhost
   tasks:
     - name: add autostart shortcuts
-      copy: src=files/{{item}}.desktop dest=/home/domjudge/.config/autostart/ owner=domjudge group=domjudge mode=0755
+      template:
+        src: files/{{item}}.desktop
+        dest: /home/domjudge/.config/autostart/
+        owner: domjudge
+        group: domjudge
+        mode: 0755
       with_items:
-        - taillog
         - rotate
+
+    - name: add autostart shortcuts from template
+      template:
+        src: files/{{item}}.desktop.j2
+        dest: /home/domjudge/.config/autostart/{{item}}.desktop
+        owner: domjudge
+        group: domjudge
+        mode: 0755
+      with_items:
+        - taillog

icpc-wf/ansible/roles/domlogo/files/domjudgelogo.desktop

@@ -32,9 +32,9 @@
     rsync_path: sudo rsync
 
 - name: add autostart shortcuts
-  copy:
-    src: domjudgelogo.desktop
-    dest: /home/domjudge/.config/autostart/
+  template:
+    src: domjudgelogo.desktop.j2
+    dest: /home/domjudge/.config/autostart/domjudgelogo.desktop
     owner: domjudge
     group: domjudge
     mode: 0755

icpc-wf/ansible/roles/domlogo/tasks/main.yml

@@ -0,0 +1,4 @@
+[Desktop Entry]
+Name=domjudgelogo
+Type=Application
+Exec=bash -c "sleep 10 && cd {{DJ_DIR}} && python3 ./domlogo.py 1>/home/domjudge/logo.out 2>/home/domjudge/logo.err"

icpc-wf/ansible/roles/domlogo/templates/domjudgelogo.desktop.j2

@@ -69,14 +69,13 @@
   tags: sync
   synchronize:
     src: .idea
-    dest: "/home/domjudge/domjudge-checkout"
+    dest: "{{DJ_DIR}}"
     owner: no
     use_ssh_args: true
-    rsync_path: sudo rsync
 
 - name: fix ownership of PHPStorm config
   file:
-    path: "/home/domjudge/domjudge-checkout/.idea"
+    path: "{{DJ_DIR}}/.idea"
     recurse: yes
     owner: domjudge
     group: domjudge