Another correction to older Apache configs

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

diff --git a/configs/apache2.config.in b/configs/apache2.config.in
index 4b60f5e..e735d20 100644 (file)
--- a/configs/apache2.config.in
+++ b/configs/apache2.config.in
@@ -1,44 +1,46 @@
-# 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.
+
+# For non-RPM installs, you should copy the relevant contents of
+# this file to a configuration location you control.
 
 #
-# Load the SHIBBOLETH module
+# Load the Shibboleth module.
 #
 LoadModule mod_shib @-PKGLIBDIR-@/mod_shib_20.so
 
 #
-# 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.
+# Ensures handler will be accessible.
 #
-ShibSchemaDir @-XMLTOOLINGXMLDIR-@/catalog.xml:@-OPENSAMLXMLDIR-@/saml20-catalog.xml:@-OPENSAMLXMLDIR-@/saml11-catalog.xml:@-PKGXMLDIR-@/catalog.xml
-ShibConfig @-PKGSYSCONFDIR-@/shibboleth2.xml
+<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>
   <Location /shibboleth-sp>
+    Satisfy Any
     Allow from all
   </Location>
-  Alias /shibboleth-sp/main.css @-PKGDOCDIR-@/main.css
-  Alias /shibboleth-sp/logo.jpg @-PKGDOCDIR-@/logo.jpg
+  Alias /shibboleth-sp/main.css @-PKGWEBDIR-@/main.css
 </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>