[Rt-commit] rt branch, 4.2-trunk, updated. rt-4.2.10-235-g9c2deca

[Alex Vandiver]

The branch, 4.2-trunk has been updated
       via  9c2decab0809208dc0256cb54dfeb1f40bb7389b (commit)
      from  97167aca6de5cc764f8e10afcca8091f20e56a09 (commit)

Summary of changes:
 docs/authentication.pod | 13 +++++++++----
 docs/web_deployment.pod | 27 +++++++++++++++++++++------
 2 files changed, 30 insertions(+), 10 deletions(-)

- Log -----------------------------------------------------------------
commit 9c2decab0809208dc0256cb54dfeb1f40bb7389b
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Tue Mar 10 16:02:40 2015 -0400

    Update the documentation to show the Apache 2.4 config
    
    Apache 2.4 changed the way access control is configured:
        httpd.apache.org/docs/2.4/upgrading.html#access
    
    Include the configuration to use in Apache 2.4.

diff --git a/docs/authentication.pod b/docs/authentication.pod
index d62a3d6..26599cd 100644
--- a/docs/authentication.pod
+++ b/docs/authentication.pod
@@ -77,10 +77,15 @@ An example of using LDAP authentication and HTTP Basic auth:
             "ldap://ldap.example.com/dc=example,dc=com"
     </Location>
     <Location /REST/1.0/NoAuth/mail-gateway>
-        Order deny,allow
-        Deny from all
-        Allow from localhost
-        Satisfy any
+        <IfVersion >= 2.4> # For Apache 2.4
+            Require local
+        </IfVersion>
+        <IfVersion < 2.4>  # For Apache 2.2
+            Order deny,allow
+            Deny from all
+            Allow from localhost
+            Satisfy any
+        </IfVersion>
     </Location>
 
 
diff --git a/docs/web_deployment.pod b/docs/web_deployment.pod
index fad3c50..a6cba44 100644
--- a/docs/web_deployment.pod
+++ b/docs/web_deployment.pod
@@ -53,8 +53,13 @@ use Apache to provide authentication.
 
         DocumentRoot "/opt/rt4/share/html"
         <Location />
-            Order allow,deny
-            Allow from all
+            <IfVersion >= 2.4> # For Apache 2.4
+                Require all granted
+            </IfVersion>
+            <IfVersion < 2.4>  # For Apache 2.2
+                Order allow,deny
+                Allow from all
+            </IfVersion>
 
             Options +ExecCGI
             AddHandler fastcgi-script fcgi
@@ -89,8 +94,13 @@ to return to the old default.
 
         DocumentRoot "/opt/rt4/share/html"
         <Location />
-            Order allow,deny
-            Allow from all
+            <IfVersion >= 2.4> # For Apache 2.4
+                Require all granted
+            </IfVersion>
+            <IfVersion < 2.4>  # For Apache 2.2
+                Order allow,deny
+                Allow from all
+            </IfVersion>
 
             Options +ExecCGI
             AddHandler fcgid-script fcgi
@@ -123,8 +133,13 @@ C<SetHandler modperl>, as the example below uses.
 
         DocumentRoot "/opt/rt4/share/html"
         <Location />
-            Order allow,deny
-            Allow from all
+            <IfVersion >= 2.4> # For Apache 2.4
+                Require all granted
+            </IfVersion>
+            <IfVersion < 2.4>  # For Apache 2.2
+                Order allow,deny
+                Allow from all
+            </IfVersion>
 
             SetHandler modperl
             PerlResponseHandler Plack::Handler::Apache2

-----------------------------------------------------------------------