From: Jakub Czajka <jakub@ekhem.eu.org>
Date: Mon, 16 Oct 2023 21:43:58 +0000 (+0200)
Subject: Restart services in a separate playbook.
X-Git-Url: https://git.ekhem.eu.org/?a=commitdiff_plain;h=1dff78a62af5ebb702ec1044bd8745285de6ce63;p=turnup.git

Restart services in a separate playbook.
---

diff --git a/server/dovecot.yaml b/server/dovecot.yaml
index 9762e8d..550ad60 100644
--- a/server/dovecot.yaml
+++ b/server/dovecot.yaml
@@ -76,8 +76,3 @@
   with_items:
     - dovecot.log
     - dovecot-info.log
-- name: Restart dovecot
-  service:
-    name: dovecot
-    state: restarted
-  become: yes
diff --git a/server/fail2ban.yaml b/server/fail2ban.yaml
index 4295c03..cf1c84b 100644
--- a/server/fail2ban.yaml
+++ b/server/fail2ban.yaml
@@ -27,8 +27,3 @@
     - fail2ban.local
     - jail.local
     - paths-common.conf
-- name: Restart fail2ban
-  service:
-    name: fail2ban
-    state: restarted
-  become: yes
diff --git a/server/git.yaml b/server/git.yaml
index 21d889a..de924ba 100644
--- a/server/git.yaml
+++ b/server/git.yaml
@@ -21,8 +21,3 @@
   become: true
   with_items:
     - gitweb.conf
-- name: Restart fcgiwrap
-  service:
-    name: fcgiwrap
-    state: restarted
-  become: yes
diff --git a/server/matrix.yaml b/server/matrix.yaml
index aabba06..e20611c 100644
--- a/server/matrix.yaml
+++ b/server/matrix.yaml
@@ -35,8 +35,3 @@
   with_items:
     - report_stats.yaml
     - server_name.yaml
-- name: Restart matrix
-  service:
-    name: matrix-synapse
-    state: restarted
-  become: yes
diff --git a/server/nginx.yaml b/server/nginx.yaml
index 8212a93..3c87a5a 100644
--- a/server/nginx.yaml
+++ b/server/nginx.yaml
@@ -26,8 +26,3 @@
   with_items:
     - mime.types
     - nginx.conf
-- name: Restart postfix
-  service:
-    name: postfix
-    state: restarted
-  become: yes
diff --git a/server/opendkim.yaml b/server/opendkim.yaml
index f70e8eb..843f534 100644
--- a/server/opendkim.yaml
+++ b/server/opendkim.yaml
@@ -39,8 +39,3 @@
       name: "ekhem.txt"
     - domain: "ekhem.eu.org"
       name: "ekhem.txt"
-- name: Restart opendkim
-  service:
-    name: opendkim
-    state: restarted
-  become: yes
diff --git a/server/postfix.yaml b/server/postfix.yaml
index 4dbbcc0..1af4bf3 100644
--- a/server/postfix.yaml
+++ b/server/postfix.yaml
@@ -29,8 +29,3 @@
     - domains.cf
     - main.cf
     - master.cf
-- name: Restart postfix
-  service:
-    name: postfix
-    state: restarted
-  become: yes
diff --git a/server/postgres.yaml b/server/postgres.yaml
index 23e5340..aab0fe3 100644
--- a/server/postgres.yaml
+++ b/server/postgres.yaml
@@ -46,8 +46,3 @@
   with_items:
     - fullchain.pem
     - privkey.pem
-- name: Restart postgres
-  service:
-    name: postgresql
-    state: restarted
-  become: yes
diff --git a/server/sshd.yaml b/server/sshd.yaml
index 7c3adcf..140eb53 100644
--- a/server/sshd.yaml
+++ b/server/sshd.yaml
@@ -12,8 +12,3 @@
     dest: "/etc/ssh"
     remote_src: true
   become: true
-- name: Restart sshd
-  service:
-    name: ssh
-    state: restarted
-  become: yes
diff --git a/server/websites.yaml b/server/websites.yaml
index 52d6126..5cdec9c 100644
--- a/server/websites.yaml
+++ b/server/websites.yaml
@@ -48,8 +48,3 @@
     - matrix.dobity.eu.org
     - pass.dobity.eu.org
     - yt.dobity.eu.org
-- name: Restart nginx
-  service:
-    name: nginx
-    state: restarted
-  become: yes
diff --git a/services.yaml b/services.yaml
new file mode 100644
index 0000000..690fe2d
--- /dev/null
+++ b/services.yaml
@@ -0,0 +1,20 @@
+# Copyright (c) 2023 Jakub Czajka <jakub@ekhem.eu.org>
+# License: GPL-3.0 or later.
+
+- hosts: servers
+  tasks:
+    - name: Restart {{ item }}.service
+      service:
+        name: "{{ item }}"
+        state: restarted
+      become: yes
+      with_items:
+        - postgresql
+        - postfix
+        - dovecot
+        - fail2ban
+        - fcgiwrap
+        - matrix-synapse
+        - opendkim
+        - nginx
+        - ssh
diff --git a/turnup.yaml b/turnup.yaml
index 72a9280..4f13818 100644
--- a/turnup.yaml
+++ b/turnup.yaml
@@ -33,6 +33,9 @@
 - name: Recreate database
   import_playbook: database.yaml
 
+- name: Restart services
+  import_playbook: services.yaml
+
 - name: Deploy cv
   import_playbook: cv.yaml