patch mailman to add a simple question-and-answer CAPTCHA

[ansible.git] / roles / apache / tasks / main.yml

diff --git a/roles/apache/tasks/main.yml b/roles/apache/tasks/main.yml
index 62f39e8ca677b5377a89eed58435470713d6f973..c195ea935d346f2b8232048bb4732b54cf02ede8 100644 (file)
--- a/roles/apache/tasks/main.yml
+++ b/roles/apache/tasks/main.yml
@@ -24,15 +24,17 @@
     dest: /etc/apache2/log-anon
     src: files/log-anon
     mode: +x
     dest: /etc/apache2/log-anon
     src: files/log-anon
     mode: +x

+  notify: apache

 - name: install shared config files
 - name: install shared config files

-  copy:
+  template:

     dest: /etc/apache2/conf-available/{{ item }}
     dest: /etc/apache2/conf-available/{{ item }}

-    src: files/{{ item }}
+    src: templates/{{ item }}

   loop:
   - ssl.conf
   - acme-challenge.conf
   - php5.conf
   - security.conf
   loop:
   - ssl.conf
   - acme-challenge.conf
   - php5.conf
   - security.conf

+  - defaults.conf

   notify: apache
 - name: enable config files
   command: a2enconf {{ item }}
   notify: apache
 - name: enable config files
   command: a2enconf {{ item }}


@@ -41,6 +43,7 @@
   loop:
   - ssl
   - security
   loop:
   - ssl
   - security

+  - defaults

   notify: apache
 - name: disable config files
   command: a2disconf {{ item }}
   notify: apache
 - name: disable config files
   command: a2disconf {{ item }}


@@ -48,6 +51,7 @@
     removes: /etc/apache2/conf-enabled/{{ item }}.conf
   loop:
   - other-vhosts-access-log
     removes: /etc/apache2/conf-enabled/{{ item }}.conf
   loop:
   - other-vhosts-access-log

+  - serve-cgi-bin

   notify: apache
 - name: install default site
   template:
   notify: apache
 - name: install default site
   template: