Rename config file.

Fix up Apache defaults.

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@2298 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/configs/Makefile.am b/configs/Makefile.am
index 790b7bf..2f40bde 100644 (file)
--- a/configs/Makefile.am
+++ b/configs/Makefile.am
@@ -4,6 +4,7 @@ AUTOMAKE_OPTIONS = foreign
 
 pkglogdir = ${localstatedir}/log/@PACKAGE@
 shirelogdir = ${localstatedir}/log/httpd
+xmldir = $(datadir)/xml
 pkgxmldir = $(datadir)/xml/@PACKAGE@
 varrundir = $(localstatedir)/run
 pkgsysconfdir = $(sysconfdir)/@PACKAGE@
@@ -18,7 +19,7 @@ pkgsysconf_DATA = \
 # installed as "foo" if "foo" does not already exist.  In other words,
 # the config files will not overwrite existing versions.
 BUILTCONFIGFILES = \
-       shibboleth.xml \
+       shibboleth2.xml \
        native.logger \
        shibd.logger \
        attribute-map.xml \
@@ -48,6 +49,7 @@ do-build-file:
            -e 's:@-LIBEXECDIR-@:${libexecdir}:g' \
            -e 's:@-PKGSYSCONFDIR-@:${pkgsysconfdir}:g' \
            -e 's:@-PKGXMLDIR-@:${pkgxmldir}:g' \
+            -e 's:@-XMLDIR-@:${xmldir}:g' \
            -e 's:@-PKGLOGDIR-@:${pkglogdir}:g' \
            -e 's:@-SHIRELOGDIR-@:${shirelogdir}:g' \
            -e 's:@-VARRUNDIR-@:${varrundir}:g'
@@ -72,7 +74,7 @@ shibd.logger: ${srcdir}/shibd.logger.in Makefile ${top_builddir}/config.status
 native.logger: ${srcdir}/native.logger.in Makefile ${top_builddir}/config.status
        $(MAKE) do-build-file FILE=$@
 
-shibboleth.xml: ${srcdir}/shibboleth.xml.in Makefile ${top_builddir}/config.status
+shibboleth2.xml: ${srcdir}/shibboleth2.xml.in Makefile ${top_builddir}/config.status
        $(MAKE) do-build-file FILE=$@
 
 attribute-map.xml: ${srcdir}/attribute-map.xml.in Makefile ${top_builddir}/config.status
@@ -113,13 +115,13 @@ CLEANFILES = \
        shibd \
        shibd.logger \
        native.logger \
-       shibboleth.xml \
+       shibboleth2.xml \
        attribute-map.xml \
        attribute-policy.xml \
        example-metadata.xml
 
 EXTRA_DIST = \
-       shibboleth.xml.in \
+       shibboleth2.xml.in \
        attribute-map.xml.in \
        attribute-policy.xml.in \
        example-metadata.xml.in \

diff --git a/configs/apache.config.in b/configs/apache.config.in
index 14f80f9..8a4ab26 100644 (file)
--- a/configs/apache.config.in
+++ b/configs/apache.config.in
@@ -14,8 +14,8 @@ LoadModule mod_shib @-LIBEXECDIR-@/mod_shib_13.so
 # 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
+ShibSchemaDir @-XMLDIR-@/xmltooling/catalog.xml:@-XMLDIR-@/opensaml/saml20-catalog.xml:@-XMLDIR-@/opensaml/saml11-catalog.xml:@-XMLDIR-@/shibboleth/catalog.xml
+ShibConfig @-PKGSYSCONFDIR-@/shibboleth2.xml
 
 #
 # An Apache handler needs to be established for the "handler" location.

diff --git a/configs/apache2.config.in b/configs/apache2.config.in
index 4a85514..e79d481 100644 (file)
--- a/configs/apache2.config.in
+++ b/configs/apache2.config.in
@@ -14,8 +14,8 @@ LoadModule mod_shib @-LIBEXECDIR-@/mod_shib_20.so
 # 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
+ShibSchemaDir @-XMLDIR-@/xmltooling/catalog.xml:@-XMLDIR-@/opensaml/saml20-catalog.xml:@-XMLDIR-@/opensaml/saml11-catalog.xml:@-XMLDIR-@/shibboleth/catalog.xml
+ShibConfig @-PKGSYSCONFDIR-@/shibboleth2.xml
 
 #
 # Used for example logo and style sheet in error templates.

diff --git a/configs/apache22.config.in b/configs/apache22.config.in
index c7fe6ee..65a1865 100644 (file)
--- a/configs/apache22.config.in
+++ b/configs/apache22.config.in
@@ -14,8 +14,8 @@ LoadModule mod_shib @-LIBEXECDIR-@/mod_shib_22.so
 # 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
+ShibSchemaDir @-XMLDIR-@/xmltooling/catalog.xml:@-XMLDIR-@/opensaml/saml20-catalog.xml:@-XMLDIR-@/opensaml/saml11-catalog.xml:@-XMLDIR-@/shibboleth/catalog.xml
+ShibConfig @-PKGSYSCONFDIR-@/shibboleth2.xml
 
 #
 # Used for example logo and style sheet in error templates.

diff --git a/configs/shibboleth.xml.in b/configs/shibboleth2.xml.in
similarity index 100%
rename from configs/shibboleth.xml.in
rename to configs/shibboleth2.xml.in

diff --git a/shibsp/base.h b/shibsp/base.h
index 02bfc56..00ecd2d 100644 (file)
--- a/shibsp/base.h
+++ b/shibsp/base.h
@@ -76,7 +76,7 @@
 /**
  * Default path to configuration file on Windows.
  */
-# define SHIBSP_CONFIG "c:\\opt\\shibboleth-sp\\etc\\shibboleth\\shibboleth.xml"
+# define SHIBSP_CONFIG "c:\\opt\\shibboleth-sp\\etc\\shibboleth\\shibboleth2.xml"
 
 /**
  * Controls default logging level of console tools and other situations

diff --git a/shibsp/paths.h.in b/shibsp/paths.h.in
index c96a1c1..61712d8 100644 (file)
--- a/shibsp/paths.h.in
+++ b/shibsp/paths.h.in
@@ -31,7 +31,7 @@
 /**\r
  * Default location of SP configuration file.\r
  */\r
-#define SHIBSP_CONFIG "@-PKGSYSCONFDIR-@/shibboleth.xml"\r
+#define SHIBSP_CONFIG "@-PKGSYSCONFDIR-@/shibboleth2.xml"\r
 \r
 /**\r
  * Default location of SP configuration file.\r