X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configs%2Fapache2.config.in;h=e735d2032a1d447382aeeee825cd9f422f821ff8;hb=16658259b0b6430b9737a61e0c5968fa4ff71181;hp=3d7de5f869a4b42c658a158d6cd4da005ab285c0;hpb=53822684741fbe17f51090bc946bdb6765571378;p=shibboleth%2Fcpp-sp.git

diff --git a/configs/apache2.config.in b/configs/apache2.config.in
index 3d7de5f..e735d20 100644
--- a/configs/apache2.config.in
+++ b/configs/apache2.config.in
@@ -1,33 +1,46 @@
-# ADD THIS TO THE END OF YOUR APACHE'S HTTPD.CONF
+# https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig
 
-######
-## SHIB Config
-######
+# RPM installations on platforms with a conf.d directory will
+# result in this file being copied into that directory for you
+# and preserved across upgrades.
 
+# 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
+
 #
-LoadModule mod_shib @-LIBEXECDIR-@/mod_shib20.so
+# Ensures handler will be accessible.
+#
+<Location /Shibboleth.sso>
+  Satisfy Any
+  Allow from all
+</Location>
 
 #
-# 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.
+# Used for example style sheet in error templates.
 #
-ShibSchemaDir @-PKGSYSCONFDIR-@
-ShibConfig @-PKGSYSCONFDIR-@/shibboleth.xml
+<IfModule mod_alias.c>
+  <Location /shibboleth-sp>
+    Satisfy Any
+    Allow from all
+  </Location>
+  Alias /shibboleth-sp/main.css @-PKGWEBDIR-@/main.css
+</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 requirement
-# use "require Shibboleth".
+# 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>