Some changes for 1.0

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

diff --git a/configs/shibboleth.ini b/configs/shibboleth.ini
index 285e856..bf624eb 100644 (file)
--- a/configs/shibboleth.ini
+++ b/configs/shibboleth.ini
@@ -4,9 +4,6 @@ schemadir=/opt/shibboleth/etc/shibboleth/
 sharsocket=/tmp/shar-socket
 
 sitesFile=http://wayf.internet2.edu/shibboleth/sites.xml
-#sitesFile=file:///mit/shibboleth/src/shibboleth/java/webApplication/sites.xml
-sitesCertFile=/opt/shibboleth/etc/shibboleth/internet2.pem
-sitesRefresh=3600
 
 # SERVER CONFIGURATION
 
@@ -27,6 +24,7 @@ accessError=/opt/shibboleth/etc/shibboleth/accessError.html
 
 [shire]
 logger=/opt/shibboleth/etc/shibboleth/shire.logger
+aap-uri=/opt/shibboleth/etc/shibboleth/AAP.xml
 
 [shar]
 logger=/opt/shibboleth/etc/shibboleth/shar.logger
@@ -35,7 +33,9 @@ logger=/opt/shibboleth/etc/shibboleth/shar.logger
 #keyfile=/opt/shibboleth/etc/shibboleth/shar.key
 #keypass=
 calist=/opt/shibboleth/etc/shibboleth/ca-bundle.crt
-aap-uri=/opt/shibboleth/etc/shibboleth/AAP.xml
+
+AATimeout=60
+AAConnectTimeout=30
 
 # The following shar items are for caching parameters
 cacheType=memory