fix vars

roles/apache/defaults/main.yml

@@ -0,0 +1,2 @@
+---
+  php: false

roles/apache/tasks/main.yaml

@@ -0,0 +1,16 @@
+---
+- include: service.yaml
+  vars:
+    service_name: apache2
+    service_packages:
+        - apache2
+- name: validate apache2 configuration
+  command: nginx -t -c /etc/nginx/nginx.conf
+  changed_when: False
+
+- name: enable apache configuration
+  file:
+      src: "/etc/apache2/sites-available/{{ config_name }}"
+      dest: "/etc/apache2/sites-enabled/{{ config_name }}"
+      state: link
+  notify: restart apache2

roles/dokuwiki/meta/main.yaml

@@ -1,4 +1,3 @@
 ---
 dependencies:
   - role: nginx
-    config_name: docuwiki.conf

roles/dokuwiki/vars/main.yml

@@ -0,0 +1 @@
+config_name: docuwiki.conf

roles/roundcube/meta/main.yaml

@@ -1,4 +1,3 @@
 ---
 dependencies:
   - role: nginx
-    config_name: roundcube.conf

roles/roundcube/tasks/main.yaml

@@ -10,14 +10,10 @@
       - roundcube-sqlite3
       - roundcube
       - roundcube-plugins
-
 - name: add nginx config for roundcube
   template:
-    dest=/etc/nginx/sites-available/roundcube.conf
-    src=roundcube_config.j2
-    owner=root
-    group=root
-    mode=0700
+      src: roundcube_nginx.j2
+      dest: "/etc/nginx/sites-available/{{ config_name }}"
   notify:
       - enable nginx configuration
       - restart nginx

roles/roundcube/vars/main.yml

@@ -0,0 +1 @@
+config_name: roundcube.conf

roles/sympa/meta/main.yaml

@@ -1,4 +1,3 @@
 ---
 dependencies:
   - role: nginx
-    config_name: sympa.conf

roles/sympa/tasks/main.yaml

@@ -3,13 +3,13 @@
   vars:
     service_name: nginx
     service_packages:
-        - nginx
+      - nginx
 - name: install sympa and associated packages
   apt: name={{ item }} state=latest
   with_items:
-      - sympa
-      - wwsympa
-      - fcgiwrap
+    - sympa
+    - wwsympa
+    - fcgiwrap
 - name: add nginx config for sympa
   template:
       src: sympa_nginx.j2
@@ -17,6 +17,3 @@
   notify:
       - enable nginx configuration
       - restart nginx
-  notify:
-      - enable nginx configuration
-      - restart nginx

roles/sympa/vars/main.yml

@@ -0,0 +1 @@
+config_name: sympa.conf