Path resolution for error templates.

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

diff --git a/configs/apache2.config.in b/configs/apache2.config.in
index e79d481..7ea0bb7 100644 (file)
--- a/configs/apache2.config.in
+++ b/configs/apache2.config.in
@@ -1,4 +1,7 @@
-# ADD THIS TO THE END OF YOUR APACHE'S HTTPD.CONF
+# RPM installations on platforms with a conf.d directory will
+# result in this file being copied into that directory for you.
+# For non-RPM installs, you can add this file to your
+# configuration using an Include command in httpd.conf
 
 ######
 ## SHIB Config
@@ -7,15 +10,7 @@
 #
 # Load the SHIBBOLETH module
 #
-LoadModule mod_shib @-LIBEXECDIR-@/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 @-XMLDIR-@/xmltooling/catalog.xml:@-XMLDIR-@/opensaml/saml20-catalog.xml:@-XMLDIR-@/opensaml/saml11-catalog.xml:@-XMLDIR-@/shibboleth/catalog.xml
-ShibConfig @-PKGSYSCONFDIR-@/shibboleth2.xml
+LoadModule mod_shib @-PKGLIBDIR-@/mod_shib_20.so
 
 #
 # Used for example logo and style sheet in error templates.
@@ -24,8 +19,8 @@ ShibConfig @-PKGSYSCONFDIR-@/shibboleth2.xml
   <Location /shibboleth-sp>
     Allow from all
   </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 @-PKGDOCDIR-@/main.css
+  Alias /shibboleth-sp/logo.jpg @-PKGDOCDIR-@/logo.jpg
 </IfModule>
 
 #