tweak apache2 config

diff --git a/roles/apache/files/other-vhosts-access-log.conf b/roles/apache/files/other-vhosts-access-log.conf
deleted file mode 100644 (file)
index 284c0cd..0000000
--- a/roles/apache/files/other-vhosts-access-log.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# Define an access log for VirtualHosts that don't define their own logfile
-#CustomLog ${APACHE_LOG_DIR}/other_vhosts_access.log vhost_combined
-
-# vim: syntax=apache ts=4 sw=4 sts=4 sr noet

diff --git a/roles/apache/tasks/main.yml b/roles/apache/tasks/main.yml
index fe51563466f38562aab6e21a3bc6646ffbc520c5..62f39e8ca677b5377a89eed58435470713d6f973 100644 (file)
--- a/roles/apache/tasks/main.yml
+++ b/roles/apache/tasks/main.yml
@@ -33,7 +33,6 @@
   - acme-challenge.conf
   - php5.conf
   - security.conf
   - acme-challenge.conf
   - php5.conf
   - security.conf

-  - other-vhosts-access-log.conf

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


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

+  - security
+  notify: apache
+- name: disable config files
+  command: a2disconf {{ item }}
+  args:
+    removes: /etc/apache2/conf-enabled/{{ item }}.conf
+  loop:
+  - other-vhosts-access-log
+  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