Merge pull request #259 from jdeathe/issue/247

CLOSES #247: Adds drop-in config for Apache server-status

Author: jdeathe

CHANGELOG.md

@@ -16,6 +16,7 @@ Summary of release changes.
 - Adds improved test workflow; added `test-setup` target to Makefile.
 - Adds Makefile target `logsdef` to handle deferred logs output within a target chain.
 - Adds `/docs` directory for supplementary documentation and simplify README.
+- Adds drop-in configuration for `/server-satus`; removes from global Apache configuration.
 - Fixes validation failure of 0 second --timeout value in `test/health_status`.
 
 ### 1.13.2 - 2019-08-05

Dockerfile

@@ -89,8 +89,6 @@ RUN useradd -r -M -d /var/www/app -s /sbin/nologin app \
 		-e 's~^LanguagePriority \(.*\)$~#LanguagePriority \1~g' \
 		-e 's~^ForceLanguagePriority \(.*\)$~#ForceLanguagePriority \1~g' \
 		-e 's~^AddLanguage \(.*\)$~#AddLanguage \1~g' \
-		-e '/#<Location \/server-status>/,/#<\/Location>/ s~^#~~' \
-		-e '/<Location \/server-status>/,/<\/Location>/ s~Allow from .example.com~Allow from localhost 127.0.0.1~' \
 		/etc/httpd/conf/httpd.conf \
 	&& { printf -- \
 		'\n%s\n%s\n%s\n%s\\\n%s%s\\\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n' \

src/etc/httpd/conf.d/00-server-status.conf

@@ -0,0 +1,11 @@
+<Location "/server-status">
+    SetHandler server-status
+    <IfVersion < 2.4>
+        Order deny,allow
+        Deny from all
+        Allow from localhost 127.0.0.1
+    </IfVersion>
+    <IfVersion >= 2.4>
+        Require host localhost 127.0.0.1
+    </IfVersion>
+</Location>