X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configs%2Fapache.config.in;h=bce4a7ea209e1c66a02c30eaba2028ec3c43a738;hb=HEAD;hp=9c30756ed0acf3cf81fdb931486c5ec8916d612f;hpb=41d82a07e6dbe00ced539bbb21123c31e64a0fa7;p=shibboleth%2Fsp.git

diff --git a/configs/apache.config.in b/configs/apache.config.in
index 9c30756..bce4a7e 100644
--- a/configs/apache.config.in
+++ b/configs/apache.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,30 +10,30 @@
 #
 # Load the Shibboleth module.
 #
-LoadModule mod_shib @-LIBEXECDIR-@/mod_shib_13.so
+LoadModule mod_shib @-PKGLIBDIR-@/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.
+# 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.
 #
-ShibSchemaDir @-PKGSYSCONFDIR-@
-ShibConfig @-PKGSYSCONFDIR-@/shibboleth.xml
-
-#
-# A handler needs to be established for the SHIRE URL
-# This matches up to the shireURL setting in shibboleth.xml
+<Files *.sso>
+SetHandler shib-handler
+</Files>
 #
-<Location /Shibboleth.shire>
-SetHandler shib-shire-post
-</Location>
+# 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 /shibtarget/main.css @-PREFIX-@/doc/shibboleth/main.css
-  Alias /shibtarget/logo.jpg @-PREFIX-@/doc/shibboleth/logo.jpg
+  Alias /shibboleth-sp/main.css @-PKGDOCDIR-@/main.css
+  Alias /shibboleth-sp/logo.jpg @-PKGDOCDIR-@/logo.jpg
 </IfModule>
 
 #
@@ -39,8 +42,8 @@ SetHandler shib-shire-post
 # 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