[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/idp.properties system/conf/jetty.xml

[noreply at shibboleth.net]

Author: tzeller
Date: Tue Dec 24 19:10:03 2013
New Revision: 5083

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5083&view=rev
Log:
Move hardcoded keystore properties to idp.properties.

Modified:
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/system/conf/jetty.xml

Modified: trunk/idp-conf/src/main/resources/conf/idp.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/idp.properties?rev=5083&r1=5082&r2=5083&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Tue Dec 24 19:10:03 2013
@@ -5,6 +5,9 @@
 jetty.https.port=8443
 jetty.dump.start=false
 jetty.dump.stop=false
+jetty.keystore.path=creds/localhost.p12
+jetty.keystore.password=changeit
+jetty.keystore.type=PKCS12
 
 # Use the XML Parser SecurityManager appropriate for the chosen parser
 # Sun/Oracle, use com.sun.org.apache.xerces.internal.util.SecurityManager

Modified: trunk/idp-conf/src/main/resources/system/conf/jetty.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/jetty.xml?rev=5083&r1=5082&r2=5083&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/jetty.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/jetty.xml Tue Dec 24 19:10:03 2013
@@ -114,12 +114,9 @@
     <!-- Configure a TLS (SSL) Context Factory                         -->
     <!-- ============================================================= -->
     <New id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
-        <Set name="KeyStorePath"><SystemProperty name="idp.home" />/creds/localhost.p12</Set>
-        <Set name="KeyStoreType">PKCS12</Set>
-        <Set name="KeyStorePassword">changeit</Set>
-        <Set name="TrustStorePath"><SystemProperty name="idp.home" />/creds/localhost.p12</Set>
-        <Set name="TrustStorePassword">changeit</Set>
-        <Set name="TrustStoreType">PKCS12</Set>
+        <Set name="KeyStorePath"><SystemProperty name="idp.home" />/<SystemProperty name="jetty.keystore.path" /></Set>
+        <Set name="KeyStoreType"><SystemProperty name="jetty.keystore.type" /></Set>
+        <Set name="KeyStorePassword"><SystemProperty name="jetty.keystore.password" /></Set>
         <Set name="EndpointIdentificationAlgorithm">HTTPS</Set>
         <Set name="ExcludeCipherSuites">
             <Array type="String">