From 29131c599f6942069b16acdf58a780ad890cbc68 Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <adellam@sevenseas.org>
Date: Mon, 4 Apr 2016 18:56:51 +0200
Subject: [PATCH] library/roles/apache/templates: Fix the ACL rules in the
 server info and server status configurations.

---
 apache/templates/info.conf.j2   | 10 ++++-----
 apache/templates/status.conf.j2 | 36 ++++++++++++++++-----------------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/apache/templates/info.conf.j2 b/apache/templates/info.conf.j2
index 14183668..413dfc24 100644
--- a/apache/templates/info.conf.j2
+++ b/apache/templates/info.conf.j2
@@ -4,17 +4,17 @@
 	#  http://servername/server-info (requires that mod_info.c be loaded).
 	# Uncomment and change the "192.0.2.0/24" to allow access from other hosts.
 	#
-	<Location {{ apache_info_location }}>
-		SetHandler server-info
-		Require local
+    <Location {{ apache_info_location }}>
+        SetHandler server-info
+        Require local
         {% if nagios_monitoring_server_ip is defined %}
         {% for addr in nagios_monitoring_server_ip %}
-        Require ip {{ addr }}/24
+        Require ip {{ addr }}
         {% endfor %}
         {% endif %}
         {% for addr in apache_info_allowed_hosts %}
         Require ip {{ addr }}
         {% endfor %}
-	</Location>
+    </Location>
 
 </IfModule>
diff --git a/apache/templates/status.conf.j2 b/apache/templates/status.conf.j2
index 9370ca11..28d37ed2 100644
--- a/apache/templates/status.conf.j2
+++ b/apache/templates/status.conf.j2
@@ -1,32 +1,32 @@
 <IfModule mod_status.c>
-	# Allow server status reports generated by mod_status,
-	# with the URL of http://servername/server-status
-	# Uncomment and change the "192.0.2.0/24" to allow access from other hosts.
+    # Allow server status reports generated by mod_status,
+    # with the URL of http://servername/server-status
+    # Uncomment and change the "192.0.2.0/24" to allow access from other hosts.
 
-	<Location {{ apache_status_location }}>
-		SetHandler server-status
-		Require local
+    <Location {{ apache_status_location }}>
+        SetHandler server-status
+        Require local
         {% if nagios_monitoring_server_ip is defined %}
         {% for addr in nagios_monitoring_server_ip %}
-        Require ip {{ addr }}/24
+        Require ip {{ addr }}
         {% endfor %}
         {% endif %}
         {% for addr in apache_status_allowed_hosts %}
         Require ip {{ addr }}
         {% endfor %}
-	</Location>
+    </Location>
 
-	# Keep track of extended status information for each request
-	ExtendedStatus On
+    # Keep track of extended status information for each request
+    ExtendedStatus On
 
-	# Determine if mod_status displays the first 63 characters of a request or
-	# the last 63, assuming the request itself is greater than 63 chars.
-	# Default: Off
-	#SeeRequestTail On
+    # Determine if mod_status displays the first 63 characters of a request or
+    # the last 63, assuming the request itself is greater than 63 chars.
+    # Default: Off
+    #SeeRequestTail On
 
-	<IfModule mod_proxy.c>
-		# Show Proxy LoadBalancer status in mod_status
-		ProxyStatus On
-	</IfModule>
+    <IfModule mod_proxy.c>
+        # Show Proxy LoadBalancer status in mod_status
+        ProxyStatus On
+    </IfModule>
 
 </IfModule>
\ No newline at end of file