Corrections to SSPCPP-493 change

[shibboleth/cpp-sp.git] / configs / apache.config.in

diff --git a/configs/apache.config.in b/configs/apache.config.in
index a1b6ec2..bf7f069 100644 (file)
--- a/configs/apache.config.in
+++ b/configs/apache.config.in
@@ -1,66 +1,55 @@
-# 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 Resource Manager and SHIRE modules.
-# Note that ORDER MATTERS!  Apache runs the modules in the
-# _reverse_ order that modules were loaded.  The RM module
-# depends on the Shire module, so you need this load-order
-# to make sure they are run properly.
-#
-# If you see log messages about "NOOP" configurations, then you
-# have messed this up.
+# Load the Shibboleth module.
 #
-LoadModule shibrm_module /opt/shibboleth/libexec/mod_shibrm.so
-LoadModule shire_module /opt/shibboleth/libexec/mod_shire.so
+LoadModule mod_shib @-PKGLIBDIR-@/mod_shib_13.so
 
 #
-# Global SHIRE Configuration
-# This is the INI 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.
 #
-SHIREConfig /opt/shibboleth/etc/shibboleth/shibboleth.ini
+<Files *.sso>
+  SetHandler shib-handler
+</Files>
 
 #
-# The SHIRE POST processor URL
-# Most of the time, this should be a path only, so that the schema,
-# host, and port will determined dynamically in each virtual host.  If
-# for some reason the dynamically derived URL is not appropriate, a
-# complete URL can be used, and may be set per-vhost explicitly:
-# SHIREURL https://<server-name>/SHIRE
+# Ensures handler will be accessible.
 #
-# The SHIREURL and subsequent "Location" handler must match.
-#
-SHIREURL /SHIRE
-<Location /SHIRE>
-  SetHandler shib-shire-post
+<Location /Shibboleth.sso>
+  Allow from all
+  AuthType None
 </Location>
 
 #
-# Configure a test directory
+# Used for example style sheet in error templates.
+#
+<IfModule mod_alias.c>
+  Alias /shibboleth-sp/main.css @-PKGWEBDIR-@/main.css
+  <Location /shibboleth-sp>
+    Allow from all
+    AuthType None
+  </Location>
+</IfModule>
+
+#
+# Configure the module for content.
 #
-# You need _at least_ a "require" option for Shib to take effect for this
-# directory.  You can either set the AuthType to "shibboleth", or you can
-# turn on ShibBasicHijack. For Shib, valid-user is a somewhat vague concept
-# and only means that a trusted origin site has authenticated the user, but
-# doesn't mean that any attributes were received.
+# 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
-  require affiliation ~ ^member@.+$
-  # require valid-user
-
-  # Per-directory SHIRE Configuration
-  #ShibBasicHijack On
-  #ShibSSLOnly On
-  #ShibAuthLifetime 14400
-  #ShibAuthTimeout 3600
-
-  # RM Configuration
-  #AuthGroupFile /foo
-  #ShibExportAssertion On
+  ShibRequestSetting requireSession 1
+  require valid-user
 </Location>