Move mod_info and mod_status examples to extra/.

(I also removed the <IfModule> sections and uncommented
them.  If you include the config file, it should be
obvious what you need.)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/simple-conf@159793 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/conf/extra/httpd-info.conf b/docs/conf/extra/httpd-info.conf
new file mode 100644 (file)
index 0000000..7d2d162
--- /dev/null
+++ b/docs/conf/extra/httpd-info.conf
@@ -0,0 +1,31 @@
+#
+# Get information about the requests being processed by the server
+# and the configuration of the server.
+#
+# Required modules: mod_status (for the server-status handler),
+#                   mod_info (for the server-info handler)
+
+#
+# Allow server status reports generated by mod_status,
+# with the URL of http://servername/server-status
+# Change the ".example.com" to match your domain to enable.
+
+<Location /server-status>
+    SetHandler server-status
+    Order deny,allow
+    Deny from all
+    Allow from .example.com
+</Location>
+
+
+#
+# Allow remote server configuration reports, with the URL of
+#  http://servername/server-info (requires that mod_info.c be loaded).
+# Change the ".example.com" to match your domain to enable.
+#
+<Location /server-info>
+    SetHandler server-info
+    Order deny,allow
+    Deny from all
+    Allow from .example.com
+</Location>

diff --git a/docs/conf/httpd-std.conf.in b/docs/conf/httpd-std.conf.in
index 0fdd0d8db162a9ba9b3e37f043c22a535103312a..0064e4963c845652a9112ec66cf6adb73f29f5da 100644 (file)
--- a/docs/conf/httpd-std.conf.in
+++ b/docs/conf/httpd-std.conf.in
@@ -702,34 +702,6 @@ ServerSignature On
     BrowserMatch "^XML Spy" redirect-carefully
 </IfModule>
 
-<IfModule status_module>
-    #
-    # Allow server status reports generated by mod_status,
-    # with the URL of http://servername/server-status
-    # Change the ".example.com" to match your domain to enable.
-    #
-    #<Location /server-status>
-    #    SetHandler server-status
-    #    Order deny,allow
-    #    Deny from all
-    #    Allow from .example.com
-    #</Location>
-</IfModule>
-
-<IfModule info_module>
-    #
-    # Allow remote server configuration reports, with the URL of
-    #  http://servername/server-info (requires that mod_info.c be loaded).
-    # Change the ".example.com" to match your domain to enable.
-    #
-    #<Location /server-info>
-    #    SetHandler server-info
-    #    Order deny,allow
-    #    Deny from all
-    #    Allow from .example.com
-    #</Location>
-</IfModule>
-
 
 ### Section 3: Virtual Hosts
 #
@@ -784,6 +756,9 @@ ServerSignature On
 # User home directories
 # Include @relsysconfdir@/extra/httpd-userdir.conf
 
+# Real-time info on requests and configuration
+# Include @relsysconfdir@/extra/httpd-info.conf
+
 #
 # Secure (SSL/TLS) connections
 # Include @rel_sysconfdir@/extra/httpd-ssl.conf