journalwatch: bind

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

diff --git a/roles/apache/tasks/main.yml b/roles/apache/tasks/main.yml
index a4d1b248863301e6eebfe718d97e5381c5ac65fb..c195ea935d346f2b8232048bb4732b54cf02ede8 100644 (file)
--- a/roles/apache/tasks/main.yml
+++ b/roles/apache/tasks/main.yml
@@ -2,7 +2,7 @@
   apt: name=apache2,python-netaddr state=latest
 - name: enable apache
   service: name=apache2 enabled=yes
   apt: name=apache2,python-netaddr state=latest
 - name: enable apache
   service: name=apache2 enabled=yes

-# config
+# apache config

 - name: enable modules
   apache2_module:
     state: present
 - name: enable modules
   apache2_module:
     state: present


@@ -24,16 +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

-  - other-vhosts-access-log.conf
+  - defaults.conf

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


@@ -41,6 +42,17 @@
     creates: /etc/apache2/conf-enabled/{{ item }}.conf
   loop:
   - ssl
     creates: /etc/apache2/conf-enabled/{{ item }}.conf
   loop:
   - ssl

+  - security
+  - defaults
+  notify: apache
+- name: disable config files
+  command: a2disconf {{ item }}
+  args:
+    removes: /etc/apache2/conf-enabled/{{ item }}.conf
+  loop:
+  - other-vhosts-access-log
+  - serve-cgi-bin
+  notify: apache

 - name: install default site
   template:
     dest: /etc/apache2/sites-available/000-default.conf
 - name: install default site
   template:
     dest: /etc/apache2/sites-available/000-default.conf