[extensions COMMIT] in /w2k3-installer/trunk/Shib2Respository: QuickInstall2.wsi ShibConfig/build.xml

[noreply at shibboleth.net]

Author: rdw
Date: Thu Oct 27 15:26:04 2011
New Revision: 332

URL: http://svn.shibboleth.net/view/extensions?rev=332&view=rev
Log:
More 2.3.4 files

Modified:
    w2k3-installer/trunk/Shib2Respository/QuickInstall2.wsi
    w2k3-installer/trunk/Shib2Respository/ShibConfig/build.xml

Modified: w2k3-installer/trunk/Shib2Respository/QuickInstall2.wsi
URL: http://svn.shibboleth.net/view/extensions/w2k3-installer/trunk/Shib2Respository/QuickInstall2.wsi?rev=332&r1=331&r2=332&view=diff
==============================================================================
Binary files - no diff available.

Modified: w2k3-installer/trunk/Shib2Respository/ShibConfig/build.xml
URL: http://svn.shibboleth.net/view/extensions/w2k3-installer/trunk/Shib2Respository/ShibConfig/build.xml?rev=332&r1=331&r2=332&view=diff
==============================================================================
--- w2k3-installer/trunk/Shib2Respository/ShibConfig/build.xml (original)
+++ w2k3-installer/trunk/Shib2Respository/ShibConfig/build.xml Thu Oct 27 15:26:04 2011
@@ -257,54 +257,40 @@
     </target>
  
     <target name="renew-cert" description="Create a new certificate/key pair."> 
-        <input message="This will create a new set of credentials for your IdP, overwriting existing credentials.  Do you really wish to proceed?" addproperty="renew.cert.do" validargs="yes,no" defaultvalue="no" /> 
-        <if> <equals arg1="${renew.cert.do}" arg2="yes" /> 
+        <input message="This will create a new set of credentials for your IdP.  If you ran this command previously and still have '*.new' files, they will be overwritten.  Do you wish to proceed?" 
+        	   addproperty="renew.cert.do" validargs="yes,no" defaultvalue="no"/> 
+        <if> 
+        	<equals arg1="${renew.cert.do}" arg2="yes"/> 
             <then> 
-
-                <input message="Where is the Shibboleth Identity Provider installed?"
-                       addproperty="idp.home.input"
-                       defaultvalue="${idp.home}" />
-                <var name="idp.home" value="${idp.home.input}" />
+            	
+                <input message="Where is the Shibboleth Identity Provider installed?" addproperty="idp.home.input" defaultvalue="${idp.home}"/>
+                <var name="idp.home" value="${idp.home.input}"/>
               
-                <pathToAbsolutePath path="${idp.home}" addproperty="idp.home.path" /> 
+                <pathToAbsolutePath path="${idp.home}" addproperty="idp.home.path"/> 
             
-                <input message="What is the fully qualified hostname of the Shibboleth Identity Provider server?" 
-                       addproperty="idp.hostname.input" 
-                       defaultvalue="${idp.hostname}" /> 
-                <var name="idp.hostname" value="${idp.hostname.input}" /> 
-                <var name="idp.entity.id" value="https://${idp.hostname}/idp/shibboleth" /> 
-
-                <echo message="Backing up old credentials" /> 
-                <buildnumber file="${resources.dir}/credentials.buildno"/>
-                <copy todir="${idp.home.path}/credentials" overwrite="true">
-                    <fileset dir="${idp.home.path}/credentials" excludes="*bak*,buildno"/>
-                    <globmapper from="idp.*" to="idp.*.bak.${build.number}"/>
-                </copy>
-
-                <input message="A keystore is about to be generated for you. Please enter a password that will be used to protect it." 
-                       addproperty="idp.keystore.pass" /> 
+                <input message="What is the fully qualified hostname of the Shibboleth Identity Provider server?" addproperty="idp.hostname.input" defaultvalue="${idp.hostname}"/> 
+                <var name="idp.hostname" value="${idp.hostname.input}"/> 
+                <var name="idp.entity.id" value="https://${idp.hostname}/idp/shibboleth"/> 
+
+                <input message="A keystore is about to be generated for you. Please enter a password that will be used to protect it." addproperty="idp.keystore.pass"/> 
 
                 <if>
-                    <isset property="env.IdPCertLifetime" />
+                    <isset property="env.IdPCertLifetime"/>
                     <then>
-                        <var name="idp.cert.lifetime" value="${env.IdPCertLifetime}" />
+                        <var name="idp.cert.lifetime" value="${env.IdPCertLifetime}"/>
                     </then>
                     <else>
-                        <var name="idp.cert.lifetime" value="20" />
+                        <var name="idp.cert.lifetime" value="20"/>
                     </else>
                 </if>
         
-                <echo message="Generating signing and encryption key, certificate, and keystore. " /> 
-                <selfSignedCert hostname="${idp.hostname}" 
-                                privateKeyFile="${idp.home.path}/credentials/idp.key" 
-                                certificateFile="${idp.home.path}/credentials/idp.crt" 
-                                keystoreFile="${idp.home.path}/credentials/idp.jks" 

[... 16 lines stripped ...]