Clean up Apache examples and reference new docs.

diff --git a/configs/apache.config.in b/configs/apache.config.in
index bce4a7e..4eaa51f 100644 (file)
--- a/configs/apache.config.in
+++ b/configs/apache.config.in
@@ -1,11 +1,11 @@
+# https://spaces.internet2.edu/display/SHIB2/NativeSPApacheConfig
+
 # 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
+# result in this file being copied into that directory for you
+# and preserved across upgrades.
 
-######
-## SHIB Config
-######
+# For non-RPM installs, you should copy the relevant contents of
+# this file to a configuration location you control.
 
 #
 # Load the Shibboleth module.
@@ -20,7 +20,7 @@ LoadModule mod_shib @-PKGLIBDIR-@/mod_shib_13.so
 <Files *.sso>
 SetHandler shib-handler
 </Files>
-#
+
 # Another way of addressing this is to apply Shibboleth
 # globally to the site in "lazy" session mode:
 # <Location />
@@ -37,16 +37,15 @@ SetHandler shib-handler
 </IfModule>
 
 #
-# Configure the module for content
+# Configure the module for content.
 #
-# You can now do most of this in shibboleth.xml using the RequestMap
-# but you MUST enable AuthType shibboleth for the module to process
+# 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 requirements
 # use "require shibboleth".
 #
 <Location /secure>
   AuthType shibboleth
-  ShibRequireSession On
+  ShibRequestSetting requireSession 1
   require valid-user
 </Location>

diff --git a/configs/apache2.config.in b/configs/apache2.config.in
index 7ea0bb7..ec3df49 100644 (file)
--- a/configs/apache2.config.in
+++ b/configs/apache2.config.in
@@ -1,14 +1,14 @@
+# https://spaces.internet2.edu/display/SHIB2/NativeSPApacheConfig
+
 # 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
+# result in this file being copied into that directory for you
+# and preserved across upgrades.
 
-######
-## SHIB Config
-######
+# For non-RPM installs, you should copy the relevant contents of
+# this file to a configuration location you control.
 
 #
-# Load the SHIBBOLETH module
+# Load the Shibboleth module.
 #
 LoadModule mod_shib @-PKGLIBDIR-@/mod_shib_20.so
 
@@ -24,16 +24,15 @@ LoadModule mod_shib @-PKGLIBDIR-@/mod_shib_20.so
 </IfModule>
 
 #
-# Configure the module for content
+# Configure the module for content.
 #
-# You can now do most of this in shibboleth.xml using the RequestMap
-# but you MUST enable AuthType shibboleth for the module to process
+# 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 requirements
 # use "require shibboleth".
 #
 <Location /secure>
   AuthType shibboleth
-  ShibRequireSession On
+  ShibRequestSetting requireSession 1
   require valid-user
 </Location>

diff --git a/configs/apache22.config.in b/configs/apache22.config.in
index 6823db5..853dd42 100644 (file)
--- a/configs/apache22.config.in
+++ b/configs/apache22.config.in
@@ -1,14 +1,14 @@
+# https://spaces.internet2.edu/display/SHIB2/NativeSPApacheConfig
+
 # 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
+# result in this file being copied into that directory for you
+# and preserved across upgrades.
 
-######
-## SHIB Config
-######
+# For non-RPM installs, you should copy the relevant contents of
+# this file to a configuration location you control.
 
 #
-# Load the SHIBBOLETH module
+# Load the Shibboleth module.
 #
 LoadModule mod_shib @-PKGLIBDIR-@/mod_shib_22.so
 
@@ -24,16 +24,15 @@ LoadModule mod_shib @-PKGLIBDIR-@/mod_shib_22.so
 </IfModule>
 
 #
-# Configure the module for content
+# Configure the module for content.
 #
-# You can now do most of this in shibboleth.xml using the RequestMap
-# but you MUST enable AuthType shibboleth for the module to process
+# 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 requirements
 # use "require shibboleth".
 #
 <Location /secure>
   AuthType shibboleth
-  ShibRequireSession On
+  ShibRequestSetting requireSession 1
   require valid-user
 </Location>