Check for null env handle.

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

diff --git a/configs/apache22.config.in b/configs/apache22.config.in
index 65a1865..744bc38 100644 (file)
--- a/configs/apache22.config.in
+++ b/configs/apache22.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,14 +10,14 @@
 #
 # 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.
 #
-ShibSchemaDir @-XMLDIR-@/xmltooling/catalog.xml:@-XMLDIR-@/opensaml/saml20-catalog.xml:@-XMLDIR-@/opensaml/saml11-catalog.xml:@-XMLDIR-@/shibboleth/catalog.xml
+ShibSchemaDir @-XMLTOOLINGXMLDIR-@/catalog.xml:@-OPENSAMLXMLDIR-@/saml20-catalog.xml:@-OPENSAMLXMLDIR-@/saml11-catalog.xml:@-PKGXMLDIR-@/catalog.xml
 ShibConfig @-PKGSYSCONFDIR-@/shibboleth2.xml
 
 #
@@ -24,8 +27,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>
 
 #