From e8696ea6564bfb24b45a8cf3ad408a9073314e56 Mon Sep 17 00:00:00 2001
From: uumas <gitcommit@uumas.fi>
Date: Wed, 19 Apr 2023 15:27:01 +0300
Subject: [PATCH] Remove worker pidfiles, not needed as result of removing
 synchrotron-balancer

---
 roles/synapse/tasks/workers.yml               | 24 ++++++++-----------
 .../systemd/matrix-synapse-worker@.service.j2 |  2 --
 .../templates/tmpfiles-matrix-synapse.conf.j2 |  1 -
 3 files changed, 10 insertions(+), 17 deletions(-)
 delete mode 100644 roles/synapse/templates/tmpfiles-matrix-synapse.conf.j2

diff --git a/roles/synapse/tasks/workers.yml b/roles/synapse/tasks/workers.yml
index 8c99684..6c66b94 100644
--- a/roles/synapse/tasks/workers.yml
+++ b/roles/synapse/tasks/workers.yml
@@ -27,26 +27,22 @@
     synapse_worker_services: []
     synapse_synchrotrons: []
 
-- name: Ensure worker pidfile dir in /run exists
-  ansible.builtin.file:
-    path: /run/matrix-synapse/
-    state: directory
-    owner: matrix-synapse
-    group: nogroup
-    mode: 0755
-
-- name: Ensure tmpfiles config for pidfile dir in place
-  ansible.builtin.template:
-    src: tmpfiles-matrix-synapse.conf.j2
-    dest: /etc/tmpfiles.d/matrix-synapse.conf
-    mode: 0644
-
 - name: Configure workers
   ansible.builtin.include_tasks: worker_type.yml
   loop: "{{ synapse_workers | dict2items }}"
   loop_control:
     loop_var: synapse_worker
 
+- name: Ensure worker pidfile dir in /run not present (legacy)
+  ansible.builtin.file:
+    path: /run/matrix-synapse/
+    state: absent
+
+- name: Ensure tmpfiles config for pidfile dir not present (legacy)
+  ansible.builtin.file:
+    path: /etc/tmpfiles.d/matrix-synapse.conf
+    state: absent
+
 - name: Ensure synchrotron balancer removed (legacy)
   ansible.builtin.include_tasks: matrix-synchrotrons.yml
   when: synapse_synchrotrons | length != 0
diff --git a/roles/synapse/templates/systemd/matrix-synapse-worker@.service.j2 b/roles/synapse/templates/systemd/matrix-synapse-worker@.service.j2
index e9a470d..d672ea1 100644
--- a/roles/synapse/templates/systemd/matrix-synapse-worker@.service.j2
+++ b/roles/synapse/templates/systemd/matrix-synapse-worker@.service.j2
@@ -10,12 +10,10 @@ After=matrix-synapse.service
 [Service]
 Type=notify
 NotifyAccess=main
-PIDFile=/run/matrix-synapse/%i.pid
 User=matrix-synapse
 WorkingDirectory=/var/lib/matrix-synapse
 EnvironmentFile=-/etc/default/matrix-synapse
 ExecStart=/opt/venvs/matrix-synapse/bin/python -m synapse.app.generic_worker --config-path=/etc/matrix-synapse/homeserver.yaml --config-path=/etc/matrix-synapse/conf.d/ --config-path=/etc/matrix-synapse/workers/%i.yaml
-ExecStartPost=/bin/sh -c "echo $MAINPID > /run/matrix-synapse/%i.pid"
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=always
 RestartSec=3
diff --git a/roles/synapse/templates/tmpfiles-matrix-synapse.conf.j2 b/roles/synapse/templates/tmpfiles-matrix-synapse.conf.j2
deleted file mode 100644
index a24b743..0000000
--- a/roles/synapse/templates/tmpfiles-matrix-synapse.conf.j2
+++ /dev/null
@@ -1 +0,0 @@
-d /run/matrix-synapse 0755 matrix-synapse nogroup - -