Restart services in a separate playbook.

diff --git a/server/dovecot.yaml b/server/dovecot.yaml
index 9762e8dbf06f0dc1e10a758cdbc29941334e9b80..550ad60fbe3939937713e8b3018047b437057c35 100644 (file)
--- 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 4295c03bc2c8ceebf286c89ed6e295a2f25070be..cf1c84b85a8535853a2dcb934b5693211933f985 100644 (file)
--- 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 21d889a66689ab54605ef9babea60f80f6fcfc04..de924baf9b72aaaea8412ed72ebbbdcd5cd26757 100644 (file)
--- 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 aabba06a399f9c72d357c98f71512658ee6cbacb..e20611c6b32147f3e51219a3a30ca0fe16ad61b0 100644 (file)
--- 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 8212a93bea5542fdfd518cea235b52028b032900..3c87a5a5d8a7af0e0324eb7d59c09f443c28bcec 100644 (file)
--- 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 f70e8ebe6a7a8c8db28329d953eb7d30ff301f62..843f534fd573639834a94da95809e07cf87b725d 100644 (file)
--- 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 4dbbcc0d2691a853b23b799bf5e9c63743371ff8..1af4bf3d824b14c5ccc988554b08e93e5054a967 100644 (file)
--- 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 23e5340768e8fc1f5560bbcb82b2b9bc2c1d2a07..aab0fe3f1b1cc58682b69708d80f502562b9cb1b 100644 (file)
--- 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 7c3adcf40dad503e7d6a9d6fdaccadb19f0793ae..140eb5369c759ab39520834255064bd50204a337 100644 (file)
--- 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 52d6126e5803cb5ce83e8e7fb054aa7b0570d06d..5cdec9cef1f125dd6eeb6562dddfb40df157dcd5 100644 (file)
--- 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 (file)
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 72a9280c90fac0271c206bcebf26e840133bc403..4f13818f1f423d9ba7d161f6fbd4a71f4b48a28f 100644 (file)
--- 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