Add OS-X launchd info.

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

diff --git a/configs/apache.config.in b/configs/apache.config.in
index d0dc13f..8a4ab26 100644 (file)
--- a/configs/apache.config.in
+++ b/configs/apache.config.in
@@ -14,8 +14,8 @@ LoadModule mod_shib @-LIBEXECDIR-@/mod_shib_13.so
 # 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
 
 #
 # An Apache handler needs to be established for the "handler" location.
@@ -37,8 +37,8 @@ SetHandler shib-handler
 # 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
+  Alias /shibboleth-sp/main.css @-PREFIX-@/doc/shibboleth/main.css
+  Alias /shibboleth-sp/logo.jpg @-PREFIX-@/doc/shibboleth/logo.jpg
 </IfModule>
 
 #