From 7fdacc01ac7ea0c81a80951bf1d6f70d885fb63d Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Sat, 2 Jun 2018 09:13:10 +0200
Subject: [PATCH] tweak apache2 config

---
 roles/apache/files/other-vhosts-access-log.conf |  4 ----
 roles/apache/tasks/main.yml                     | 10 +++++++++-
 2 files changed, 9 insertions(+), 5 deletions(-)
 delete mode 100644 roles/apache/files/other-vhosts-access-log.conf

diff --git a/roles/apache/files/other-vhosts-access-log.conf b/roles/apache/files/other-vhosts-access-log.conf
deleted file mode 100644
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 fe51563..62f39e8 100644
--- a/roles/apache/tasks/main.yml
+++ b/roles/apache/tasks/main.yml
@@ -33,7 +33,6 @@
   - acme-challenge.conf
   - php5.conf
   - security.conf
-  - other-vhosts-access-log.conf
   notify: apache
 - name: enable config files
   command: a2enconf {{ item }}
@@ -41,6 +40,15 @@
     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
-- 
2.30.2