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

[noreply at shibboleth.net]

Author: scantor
Date: Tue May 27 17:00:15 2014
New Revision: 5976

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5976&view=rev
Log:
Split off keys, and move profile defaults for legacy config into system tree

Added:
    trunk/idp-conf/src/main/resources/creds/idp-encryption.crt
    trunk/idp-conf/src/main/resources/creds/idp-encryption.key
    trunk/idp-conf/src/main/resources/creds/idp-signing.crt
      - copied, changed from r5965, trunk/idp-conf/src/main/resources/creds/idp.crt
    trunk/idp-conf/src/main/resources/creds/idp-signing.key
      - copied, changed from r5965, trunk/idp-conf/src/main/resources/creds/idp.key
    trunk/idp-conf/src/main/resources/system/conf/profile-defaults.xml
      - copied, changed from r5965, trunk/idp-conf/src/main/resources/conf/profile-defaults.xml
Modified:
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/conf/profile-defaults.xml
    trunk/idp-conf/src/main/resources/conf/relying-party.xml
    trunk/idp-conf/src/main/resources/conf/services-user.xml
    trunk/idp-conf/src/main/resources/creds/TODO.txt
    trunk/idp-conf/src/main/resources/creds/idp.crt
    trunk/idp-conf/src/main/resources/creds/idp.key

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=5976&r1=5975&r2=5976&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Tue May 27 17:00:15 2014
@@ -10,6 +10,16 @@
 idp.sealer.storePassword = password
 idp.sealer.alias = idpSecretKey
 idp.sealer.keyPassword = password
+
+# Settings for public/private signing and encryption key(s)
+# During decryption key rollover, point the ".2" properties
+# at a second keypair, restart, then publish it in your metadata.
+idp.signing.key = ${idp.home}/creds/idp-signing.key
+idp.signing.cert = ${idp.home}/creds/idp-signing.crt
+idp.encryption.key = ${idp.home}/creds/idp-encrypt.key
+idp.encryption.cert = ${idp.home}/creds/idp-encrypt.crt
+idp.encryption.key.2 = ${idp.home}/creds/idp-encrypt.key
+idp.encryption.cert.2 = ${idp.home}/creds/idp-encrypt.crt
 
 # Configures the primary server-side storage plugin
 idp.storage.StorageService = org.opensaml.storage.impl.MemoryStorageService

Modified: trunk/idp-conf/src/main/resources/conf/relying-party.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/relying-party.xml?rev=5976&r1=5975&r2=5976&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/relying-party.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/relying-party.xml Tue May 27 17:00:15 2014
@@ -74,10 +74,8 @@
     <!--  TODO -->
     
     <security:Credential id="IdPCredential" xsi:type="security:X509Filesystem">
-        <security:PrivateKey>${idp.home}/creds/idp.key</security:PrivateKey>
-        <security:Certificate>${idp.home}/creds/idp.crt</security:Certificate>
+        <security:PrivateKey>${idp.signing.key}</security:PrivateKey>
+        <security:Certificate>${idp.signing.cert}</security:Certificate>
     </security:Credential>
     
-   
-    
 </rp:RelyingPartyGroup>

Modified: trunk/idp-conf/src/main/resources/conf/services-user.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/services-user.xml?rev=5976&r1=5975&r2=5976&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/services-user.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/services-user.xml Tue May 27 17:00:15 2014
@@ -76,7 +76,7 @@
 
     <util:list id="shibboleth.RelyingPartyResolverResources">
         <value>file:///${idp.home}/conf/relying-party.xml</value>
-        <value>file:///${idp.home}/conf/profile-defaults.xml</value>
+        <value>file:///${idp.home}/system/conf/profile-defaults.xml</value>
         <value>file:///${idp.home}/conf/property-placeholder.xml</value>
     </util:list>
 

Modified: trunk/idp-conf/src/main/resources/creds/TODO.txt
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/creds/TODO.txt?rev=5976&r1=5975&r2=5976&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/creds/TODO.txt (original)
+++ trunk/idp-conf/src/main/resources/creds/TODO.txt Tue May 27 17:00:15 2014
@@ -1,5 +1,6 @@
 2013-12-24 tz
-The keystores in creds/ were copied from java-idp-testbed and are placeholders which will be removed later. Hopefully they will be created during installation.
+The keystores in creds/ were copied from java-idp-testbed and are placeholders which will be removed later.
+Hopefully they will be created during installation.
 2014-04-30

[... 19 lines stripped ...]