From 9c13a78f8b07bcfc118da90458032b9b041272f4 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Tue, 13 Mar 2012 15:45:17 +0000
Subject: [PATCH] - default config:  * unrestricted access to (only) /var/www 
 * remove (commented) Mutex, MaxRanges, ScriptSock

---
 httpd.conf | 36 +++++++++++-------------------------
 httpd.spec |  3 +++
 2 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/httpd.conf b/httpd.conf
index ebffd61..1f973bb 100644
--- a/httpd.conf
+++ b/httpd.conf
@@ -30,16 +30,6 @@
 #
 ServerRoot "/etc/httpd"
 
-#
-# Mutex: Allows you to set the mutex mechanism and mutex file directory
-# for individual mutexes, or change the global defaults
-#
-# Uncomment and change the directory if mutexes are file-based and the default
-# mutex file directory is not on a local disk or is not appropriate for some
-# other reason.
-#
-# Mutex default:logs
-
 #
 # Listen: Allows you to bind Apache to specific IP addresses and/or
 # ports, instead of the default. See also the <VirtualHost>
@@ -127,6 +117,17 @@ ServerAdmin root@localhost
 # symbolic links and aliases may be used to point to other locations.
 #
 DocumentRoot "/var/www/html"
+
+#
+# Relax access to content within /var/www.
+#
+<Directory "/var/www">
+    AllowOverride None
+    # Allow open access:
+    Require all granted
+</Directory>
+
+# Further relax access to the default document root:
 <Directory "/var/www/html">
     #
     # Possible values for the Options directive are "None", "All",
@@ -247,14 +248,6 @@ LogLevel warn
 
 </IfModule>
 
-<IfModule cgid_module>
-    #
-    # ScriptSock: On threaded servers, designate the path to the UNIX
-    # socket used to communicate with the CGI daemon of mod_cgid.
-    #
-    #Scriptsock logs/cgisock
-</IfModule>
-
 #
 # "/var/www/cgi-bin" should be changed to whatever your ScriptAliased
 # CGI directory exists, if you have that configured.
@@ -340,13 +333,6 @@ MIMEMagicFile conf/magic
 #ErrorDocument 402 http://www.example.com/subscription_info.html
 #
 
-#
-# MaxRanges: Maximum number of Ranges in a request before
-# returning the entire resource, or one of the special
-# values 'default', 'none' or 'unlimited'.
-# Default setting is to accept 200 Ranges.
-#MaxRanges unlimited
-
 #
 # EnableMMAP and EnableSendfile: On systems that support it, 
 # memory-mapping or the sendfile syscall may be used to deliver
diff --git a/httpd.spec b/httpd.spec
index a4651fc..e450243 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -507,6 +507,9 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Mar 13 2012 Joe Orton <jorton@redhat.com> - 2.4.1-2
 - clean docroot better
 - ship proxy, ssl directories within /var/cache/httpd
+- default config:
+ * unrestricted access to (only) /var/www
+ * remove (commented) Mutex, MaxRanges, ScriptSock
 
 * Tue Mar  6 2012 Joe Orton <jorton@redhat.com> - 2.4.1-1
 - update to 2.4.1