Merge pull request rancher#7263 from cloudnautique/move_update_ssl_sc…

…ript_in_server Move update ssl script in server
Cerfoglg · Jan 5, 2017 · 96778df · 96778df
2 parents aa22f3f + 08278ac
commit 96778df
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/server/artifacts/cattle.sh b/server/artifacts/cattle.sh
@@ -171,8 +171,6 @@ run() {
 
     env | grep CATTLE | grep -v PASS | sort
 
-    update-rancher-ssl
-
     local ram=$(free -g --si | awk '/^Mem:/{print $2}')
     if [ ${ram} -gt 6 ]; then
         MX="4g"
@@ -260,6 +258,8 @@ master()
     run
 }
 
+update-rancher-ssl
+
 if [ "$1" = "extract" ]; then
     extract
 elif [ "$CATTLE_MASTER" = true ]; then

diff --git a/server/bin/update-rancher-ssl b/server/bin/update-rancher-ssl
@@ -16,7 +16,7 @@ if [ -f "$CA_ROOT" ]; then
 
   if [ -n "$CATTLE_RANCHER_SERVER_VERSION" ]; then 
     # Remove the key if it exists
-    if keytool -list -keystore $JKS_STORE -alias rancher_ca -storepass $JAVA_STORE_PASS ; then
+    if keytool -list -keystore $JKS_STORE -alias rancher_ca -storepass $JAVA_STORE_PASS 2>&1 > /dev/null ; then
         keytool -delete -alias rancher_ca -storepass $JAVA_STORE_PASS -keystore $JKS_STORE -noprompt
     fi