summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--roles/git/tasks/gitweb.yml1
-rw-r--r--roles/lists/handlers/main.yml7
-rw-r--r--roles/lists/tasks/sympa.yml1
3 files changed, 7 insertions, 2 deletions
diff --git a/roles/git/tasks/gitweb.yml b/roles/git/tasks/gitweb.yml
index a72cc65..3ecbdd6 100644
--- a/roles/git/tasks/gitweb.yml
+++ b/roles/git/tasks/gitweb.yml
@@ -27,40 +27,41 @@
- gitweb
# for pulls over HTTP/HTTPS
- www-data
# XXX workaround encoding issues in FCGI mode
# http://git.661346.n2.nabble.com/Gitweb-running-as-FCGI-does-not-print-its-output-in-UTF-8-td7573415.html
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=720308
- name: Copy gitweb.cgi wrapper to fix encoding
copy: src=usr/lib/cgi-bin/gitweb-wrapper.fcgi
dest=/usr/lib/cgi-bin/gitweb-wrapper.fcgi
owner=root group=root
mode=0755
- name: Copy gitweb.{service,socket}
copy: src=lib/systemd/system/{{ item }}
dest=/lib/systemd/system/{{ item }}
owner=root group=root
mode=0644
notify:
- systemctl daemon-reload
+ - Restart gitweb
with_items:
- gitweb.service
- gitweb.socket
- meta: flush_handlers
- name: Enable gitweb
service: name=gitweb enabled=yes
- name: Start gitweb
service: name=gitweb state=started
- name: Generate a private key and a X.509 certificate for Nginx
command: genkeypair.sh x509
--pubkey=/etc/nginx/ssl/git.fripost.org.pem
--privkey=/etc/nginx/ssl/git.fripost.org.key
--ou=WWW --cn=git.fripost.org --dns=git.fripost.org --dns=gitweb.fripost.org
-t rsa -b 4096 -h sha512
register: r1
diff --git a/roles/lists/handlers/main.yml b/roles/lists/handlers/main.yml
index 811b86d..d4dd998 100644
--- a/roles/lists/handlers/main.yml
+++ b/roles/lists/handlers/main.yml
@@ -1,12 +1,15 @@
---
+- name: systemctl daemon-reload
+ command: /bin/systemctl daemon-reload
+
- name: Reload Postfix
service: name=postfix state=reloaded
- name: Restart Nginx
service: name=nginx state=restarted
- name: Restart Sympa
service: name=sympa state=restarted
-- name: systemctl daemon-reload
- command: /bin/systemctl daemon-reload
+- name: Restart wwsympa
+ service: name=wwsympa state=restarted
diff --git a/roles/lists/tasks/sympa.yml b/roles/lists/tasks/sympa.yml
index 245e148..6aa1852 100644
--- a/roles/lists/tasks/sympa.yml
+++ b/roles/lists/tasks/sympa.yml
@@ -57,31 +57,32 @@
# rotating logs
- name: Don't restart sympa on logrotate
lineinfile: "dest=/etc/logrotate.d/sympa state=absent
regexp='\\bsympa reload\\b'"
tags:
- logrotate
- name: Start Sympa
service: name=sympa state=started
when: not (r1.changed or r2.changed or r3.changed or r4.changed)
- meta: flush_handlers
- name: Copy wwsympa.{service,socket}
copy: src=lib/systemd/system/{{ item }}
dest=/lib/systemd/system/{{ item }}
owner=root group=root
mode=0644
notify:
- systemctl daemon-reload
+ - Restart wwsympa
with_items:
- wwsympa.service
- wwsympa.socket
- meta: flush_handlers
- name: Enable WWSympa
service: name=wwsympa enabled=yes
- name: Start WWSympa
service: name=wwsympa state=started