From 03aae520e883fa76dc9312208293290b3a23f5d7 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Fri, 28 Jul 2017 15:28:19 -0400
Subject: [PATCH] apache: server-status only for default vhost

---
 apache/files/evolinux-defaults.conf       |  7 +++++++
 apache/tasks/main.yml                     |  6 ++++++
 apache/templates/evolinux-default.conf.j2 | 17 +++++++++++++++++
 3 files changed, 30 insertions(+)

diff --git a/apache/files/evolinux-defaults.conf b/apache/files/evolinux-defaults.conf
index ca02d032..e4f1f512 100644
--- a/apache/files/evolinux-defaults.conf
+++ b/apache/files/evolinux-defaults.conf
@@ -22,3 +22,10 @@ SSLCipherSuite HIGH:MEDIUM:!aNULL:!MD5:!RC4
 <Files ~ "\.(inc|bak)$">
     Require all denied
 </Files>
+
+<IfModule mod_status.c>
+    ExtendedStatus On
+    <IfModule mod_proxy.c>
+        ProxyStatus On
+    </IfModule>
+</IfModule>
diff --git a/apache/tasks/main.yml b/apache/tasks/main.yml
index a5ecf9fc..2c919a41 100644
--- a/apache/tasks/main.yml
+++ b/apache/tasks/main.yml
@@ -66,6 +66,12 @@
   tags:
   - apache
 
+- name: disable status.conf
+  file:
+    dest: /etc/apache2/mods-enabled/status.conf
+    state: absent
+  notify: reload apache
+
 - name: Ensure Apache config files are enabled
   command: "a2enconf {{ item }}"
   register: command_result
diff --git a/apache/templates/evolinux-default.conf.j2 b/apache/templates/evolinux-default.conf.j2
index 48fec271..a1f681e4 100644
--- a/apache/templates/evolinux-default.conf.j2
+++ b/apache/templates/evolinux-default.conf.j2
@@ -49,6 +49,15 @@
     <Location /munin_opcache.php>
         Require local
     </Location>
+
+    <IfModule mod_status.c>
+        <Location /server-status>
+            SetHandler server-status
+            include /etc/apache2/private_ipaddr_whitelist.conf
+            Require local
+        </Location>
+    </IfModule>
+
 </VirtualHost>
 
 <IfModule mod_ssl.c>
@@ -101,5 +110,13 @@
         ErrorLog /var/log/apache2/error.log
         LogLevel warn
 
+        <IfModule mod_status.c>
+            <Location /server-status>
+                SetHandler server-status
+                include /etc/apache2/private_ipaddr_whitelist.conf
+                Require local
+            </Location>
+        </IfModule>
+
     </VirtualHost>
 </IfModule>