#
# Load the SHIBBOLETH module
#
-LoadModule mod_shib @-LIBEXECDIR-@/mod_shib_20.so
+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.
#
-ShibSchemaDir @-PKGXMLDIR-@
-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
#
# Used for example logo and style sheet in error templates.
#
<IfModule mod_alias.c>
- Alias /shibtarget/main.css @-PREFIX-@/doc/shibboleth/main.css
- Alias /shibtarget/logo.jpg @-PREFIX-@/doc/shibboleth/logo.jpg
+ <Location /shibboleth-sp>
+ Allow from all
+ </Location>
+ Alias /shibboleth-sp/main.css @-PKGDOCDIR-@/main.css
+ Alias /shibboleth-sp/logo.jpg @-PKGDOCDIR-@/logo.jpg
</IfModule>
#