Another correction to older Apache configs

[shibboleth/cpp-sp.git] / configs / apache.config.in

diff --git a/configs/apache.config.in b/configs/apache.config.in
index bfe69ef..ba46f6b 100644 (file)
--- a/configs/apache.config.in
+++ b/configs/apache.config.in
@@ -1,21 +1,16 @@
-# ADD THIS TO THE END OF YOUR APACHE'S HTTPD.CONF
+# https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig
 
-######
-## SHIB Config
-######
+# RPM installations on platforms with a conf.d directory will
+# result in this file being copied into that directory for you
+# and preserved across upgrades.
 
-#
-# Load the Shibboleth module.
-#
-LoadModule mod_shib @-LIBEXECDIR-@/mod_shib_13.so
+# For non-RPM installs, you should copy the relevant contents of
+# this file to a configuration location you control.
 
 #
-# Global Configuration
-# This is the XML file that contains all the global, non-apache-specific
-# configuration.  Look at this file for most of your configuration parameters.
+# Load the Shibboleth module.
 #
-ShibSchemaDir @-XMLDIR-@/xmltooling/catalog.xml:@-XMLDIR-@/opensaml/saml20-catalog.xml:@-XMLDIR-@/opensaml/saml11-catalog.xml:@-XMLDIR-@/shibboleth/catalog.xml
-ShibConfig @-PKGSYSCONFDIR-@/shibboleth2.xml
+LoadModule mod_shib @-PKGLIBDIR-@/mod_shib_13.so
 
 #
 # An Apache handler needs to be established for the "handler" location.
@@ -23,35 +18,38 @@ ShibConfig @-PKGSYSCONFDIR-@/shibboleth2.xml
 # extension.
 #
 <Files *.sso>
-SetHandler shib-handler
+  SetHandler shib-handler
 </Files>
+
+#
+# Ensures handler will be accessible.
 #
-# Another way of addressing this is to apply Shibboleth
-# globally to the site in "lazy" session mode:
-# <Location />
-# AuthType shibboleth
-# require shibboleth
-# </Location>
+<Location /Shibboleth.sso>
+  Satisfy Any
+  Allow from all
+</Location>
 
 #
-# Used for example logo and style sheet in error templates.
+# Used for example style sheet in error templates.
 #
 <IfModule mod_alias.c>
-  Alias /shibboleth-sp/main.css @-PKGDOCDIR-@/main.css
-  Alias /shibboleth-sp/logo.jpg @-PKGDOCDIR-@/logo.jpg
+  Alias /shibboleth-sp/main.css @-PKGWEBDIR-@/main.css
+  <Location /shibboleth-sp>
+    Satisfy Any
+    Allow from all
+  </Location>
 </IfModule>
 
 #
-# Configure the module for content
+# Configure the module for content.
 #
-# You can now do most of this in shibboleth.xml using the RequestMap
-# but you MUST enable AuthType shibboleth for the module to process
+# You MUST enable AuthType shibboleth for the module to process
 # any requests, and there MUST be a require command as well. To
 # enable Shibboleth but not specify any session/access requirements
 # use "require shibboleth".
 #
 <Location /secure>
   AuthType shibboleth
-  ShibRequireSession On
+  ShibRequestSetting requireSession 1
   require valid-user
 </Location>