Merge trust and metadata config.

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

diff --git a/configs/shibboleth.ini b/configs/shibboleth.ini
index 0e2cc6e..0844963 100644 (file)
--- a/configs/shibboleth.ini
+++ b/configs/shibboleth.ini
@@ -23,11 +23,11 @@ accessError=/opt/shibboleth/etc/shibboleth/accessError.html
 [shire]
 logger=/opt/shibboleth/etc/shibboleth/shire.logger
 aap-uri=/opt/shibboleth/etc/shibboleth/AAP.xml
-metadata=sites
+metadata=metadata_shire
 
 [shar]
 logger=/opt/shibboleth/etc/shibboleth/shar.logger
-metadata=sites
+metadata=metadata_shar
 
 # Should provide a key-pair and certificate
 # Can use mod_ssl's server.crt/server.key if you set file permissions
@@ -47,10 +47,11 @@ cacheClean=300
 # idle timeout (in seconds)
 cacheTimeout=14400
 
-[sites]
+[metadata_shire]
 edu.internet2.middleware.shibboleth.metadata.XML=/opt/shibboleth/etc/shibboleth/sites.xml
 
-[trust]
+[metadata_shar]
+edu.internet2.middleware.shibboleth.metadata.XML=/opt/shibboleth/etc/shibboleth/sites.xml
 edu.internet2.middleware.shibboleth.trust.XML=/opt/shibboleth/etc/shibboleth/trust.xml
 
 [attributes]