2 次代码提交 b1b3500eff ... 7978a69186

作者 SHA1 备注 提交日期
  Laurent Hory 7978a69186 fix apache and prosody notification 8 年之前
  Laurent Hory 865043d30e add new virtual hosts 8 年之前

+ 2 - 0
roles/certbot/handlers/main.yml

@@ -0,0 +1,2 @@
+- name: restart prosody
+  service: name=prosody state=restarted

+ 8 - 4
roles/certbot/tasks/main.yml

@@ -4,14 +4,16 @@
 
 - include: renewal.yml subdomain={{item}}
   with_items:
-    - owncloud.hory.me
+    - courses.hory.me
+    - demo.hory.me
+    - git.hory.me
     - monitor.hory.me
+    - owncloud.hory.me
+    - plante.hory.me
     - postfixadmin.hory.me
+    - sgp.hory.me
     - sound.hory.me
-    - git.hory.me
-    - plante.hory.me
     - wiki.hory.me
-    - demo.hory.me
 
 - name: disable temporary sites
   command: "a2dissite *"
@@ -22,3 +24,5 @@
   file:
     path: /etc/apache2/sites-available/renewal.conf
     state: absent
+  notify:
+    - restart prosody

+ 4 - 4
roles/disable-apache/tasks/main.yml

@@ -15,8 +15,8 @@
 
 - name: enable renewal site
   command: "a2ensite renewal renewal-ssl"
-  notify:
-    - reload apache
 
-- name: test
-  command: "echo test"
+- name: reload apache
+  service:
+    name: apache2
+    state: reloaded

+ 2 - 0
roles/enable-apache/meta/main.yml

@@ -0,0 +1,2 @@
+dependencies:
+  - role: disable-apache

+ 8 - 0
roles/enable-apache/tasks/main.yml

@@ -1,6 +1,10 @@
 - name: reload all sites
   command: "a2ensite {{item}}"
   with_items:
+    - courses
+    - courses-ssl
+    - demo
+    - demo-ssl
     - git
     - git-ssl
     - monitoring
@@ -11,9 +15,13 @@
     - plante-ssl
     - postfixadmin
     - postfixadmin-ssl
+    - sgp
+    - sgp-ssl
     - sound
     - sound-ssl
     - wiki
     - wiki-ssl
     - www.hory.me
     - www.hory.me-ssl
+  notify:
+    - reload apache