X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configs%2Fapache22.config.in;h=0154e6db6ed09585f729fb60b824bb31d96432d1;hb=0f24dfc6f5642609ec000b647044c6fda4805721;hp=c7fe6eebd9682316b3a1ef8fe3e9d2485102da37;hpb=12fd0338f5668d90910b19130d1fd13c65bec1c9;p=shibboleth%2Fcpp-sp.git

diff --git a/configs/apache22.config.in b/configs/apache22.config.in
index c7fe6ee..0154e6d 100644
--- a/configs/apache22.config.in
+++ b/configs/apache22.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 @-LIBEXECDIR-@/mod_shib_22.so
+LoadModule mod_shib @-PKGLIBDIR-@/mod_shib_22.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 @-PKGXMLDIR-@
-ShibConfig @-PKGSYSCONFDIR-@/shibboleth.xml
+<Location /Shibboleth.sso>
+  Allow from all
+  AuthType None
+</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>
     Allow from all
+    AuthType None
   </Location>
-  Alias /shibboleth-sp/main.css @-PREFIX-@/doc/shibboleth/main.css
-  Alias /shibboleth-sp/logo.jpg @-PREFIX-@/doc/shibboleth/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>