Apache 2.2 config

diff --git a/configs/Makefile.am b/configs/Makefile.am
index 2f3a184..b5b92d8 100644 (file)
--- a/configs/Makefile.am
+++ b/configs/Makefile.am
@@ -11,6 +11,7 @@ pkgsysconf_DATA = \
        shibd \
        apache.config \
        apache2.config \
+       apache22.config \
        inqueue.pem
 
 # The config files are installed "special".  Unlike the entries in
@@ -59,6 +60,9 @@ apache.config: ${srcdir}/apache.config.in Makefile ${top_builddir}/config.status
 apache2.config: ${srcdir}/apache2.config.in Makefile ${top_builddir}/config.status
        $(MAKE) do-build-file FILE=$@
 
+apache22.config: ${srcdir}/apache22.config.in Makefile ${top_builddir}/config.status
+       $(MAKE) do-build-file FILE=$@
+
 shibd: ${srcdir}/shibd.in Makefile ${top_builddir}/config.status
        $(MAKE) do-build-file FILE=$@
 
@@ -105,6 +109,7 @@ install-data-local: all-data-local
 CLEANFILES = \
        apache.config \
        apache2.config \
+       apache22.config \
        shibd \
        shibd.logger \
        native.logger \
@@ -119,6 +124,7 @@ EXTRA_DIST = .cvsignore \
        shibd.logger.in \
        apache.config.in \
        apache2.config.in \
+       apache22.config.in \
        shibd.in \
        shibboleth.logger \
        accessError.html \

diff --git a/configs/apache2.config.in b/configs/apache2.config.in
index 964557c..4a85514 100644 (file)
--- a/configs/apache2.config.in
+++ b/configs/apache2.config.in
@@ -21,6 +21,9 @@ ShibConfig @-PKGSYSCONFDIR-@/shibboleth.xml
 # Used for example logo and style sheet in error templates.
 #
 <IfModule mod_alias.c>
+  <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
 </IfModule>

diff --git a/configs/apache22.config.in b/configs/apache22.config.in
new file mode 100644 (file)
index 0000000..c7fe6ee
--- /dev/null
+++ b/configs/apache22.config.in
@@ -0,0 +1,44 @@
+# ADD THIS TO THE END OF YOUR APACHE'S HTTPD.CONF
+
+######
+## SHIB Config
+######
+
+#
+# Load the SHIBBOLETH module
+#
+LoadModule mod_shib @-LIBEXECDIR-@/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 @-PKGXMLDIR-@
+ShibConfig @-PKGSYSCONFDIR-@/shibboleth.xml
+
+#
+# Used for example logo and style sheet in error templates.
+#
+<IfModule mod_alias.c>
+  <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
+</IfModule>
+
+#
+# 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
+# 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
+  require valid-user
+</Location>