Merge pull request #2348 from tronprotocol/update_tron_encrypt_file_for_master

Change tron.enc and tron.sh for update pub_key

Author: wangzichichi

deploy.sh

@@ -1,8 +1,10 @@
 #!/bin/bash
 if [[ "$TRAVIS_BRANCH" = "develop" || "$TRAVIS_BRANCH" = "master" ]];then
     stestlogname="`date +%Y%m%d%H%M%S`_stest.log"
+    echo "try to test stest_server network"
     timeout 10 ping -c 5  47.93.42.145 > /dev/null || exit 1
     timeout 10 ping -c 5  47.93.18.60  > /dev/null || exit 1
+    echo "stest_server network good"
     stest_server=""
     docker_num_in_145=`ssh -p 22008 -t [email protected] 'docker ps -a | wc -l'`
     docker_num_in_145=`echo $docker_num_in_145 | tr -d "\r"`

tron.enc

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-if [ $encrypted_e5855cb9e09c_key ];then
-  openssl aes-256-cbc -K $encrypted_e5855cb9e09c_key -iv $encrypted_e5855cb9e09c_iv -in tron.enc -out tron -d
+if [ $encrypted_43b7d2f1321f_key ];then
+  openssl aes-256-cbc -K $encrypted_43b7d2f1321f_key -iv $encrypted_43b7d2f1321f_iv -in tron.enc -out tron -d
   cat tron > ~/.ssh/id_rsa
   chmod 600 ~/.ssh/id_rsa
   echo "Add docker server success"