#
# Load the Shibboleth module.
#
-LoadModule shire_module @-LIBEXECDIR-@/mod_shib13.so
+LoadModule mod_shib @-LIBEXECDIR-@/mod_shib_13.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.
#
-ShibSchemaDir @-PKGSYSCONFDIR-@
-ShibConfig @-PKGSYSCONFDIR-@/shibboleth.xml
+ShibSchemaDir @-XMLDIR-@/xmltooling/catalog.xml:@-XMLDIR-@/opensaml/saml20-catalog.xml:@-XMLDIR-@/opensaml/saml11-catalog.xml:@-XMLDIR-@/shibboleth/catalog.xml
+ShibConfig @-PKGSYSCONFDIR-@/shibboleth2.xml
#
-# A handler needs to be established for the SHIRE URL
-# This matches up to the shireURL setting in shibboleth.xml
+# An Apache handler needs to be established for the "handler" location.
+# This applies the handler to any requests for a resource with a ".sso"
+# extension.
#
-<Location /Shibboleth.shire>
-SetHandler shib-shire-post
-</Location>
+<Files *.sso>
+SetHandler shib-handler
+</Files>
+#
+# Another way of addressing this is to apply Shibboleth
+# globally to the site in "lazy" session mode:
+# <Location />
+# AuthType shibboleth
+# require shibboleth
+# </Location>
+
+#
+# Used for example logo and 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
+</IfModule>
#
# 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
# any requests, and there MUST be a require command as well. To
-# enable Shibboleth but not specify any session/access requirement
-# use "require Shibboleth".
+# enable Shibboleth but not specify any session/access requirements
+# use "require shibboleth".
#
<Location /secure>
AuthType shibboleth