Update cos backup

backup_setup.sh

@@ -168,27 +168,33 @@ fi
 
 if [[ "$DESC_BK" =~ ^[3,5,6]$ ]]; then
   [ ! -e "${python_install_dir}/bin/python" ] && Install_Python
-  [ ! -e "${python_install_dir}/lib/coscmd" ] && ${python_install_dir}/bin/pip install coscmd==1.7.4 >/dev/null 2>&1 
+  [ ! -e "${python_install_dir}/lib/coscmd" ] && ${python_install_dir}/bin/pip install coscmd >/dev/null 2>&1 
   sed -i "/if query_yes_no/{ n; s/^.*/#&/; }" ${python_install_dir}/lib/python2.7/site-packages/coscmd/cos_client.py
   sed -i "s/if query_yes_no/#if query_yes_no/" ${python_install_dir}/lib/python2.7/site-packages/coscmd/cos_client.py
   while :; do echo
     echo 'Please select your backup datacenter:'
-    echo -e "\t ${CMSG}1${CEND}. 华南(广州)  ${CMSG}2${CEND}. 华北(天津)"
-    echo -e "\t ${CMSG}3${CEND}. 华东(上海)  ${CMSG}4${CEND}. 西南(成都)"
-    echo -e "\t ${CMSG}5${CEND}. 新加坡"
+    echo -e "\t ${CMSG}1${CEND}. 北京一区(华北)  ${CMSG}2${CEND}. 北京"
+    echo -e "\t ${CMSG}3${CEND}. 上海(华东)      ${CMSG}4${CEND}. 广州(华南)"
+    echo -e "\t ${CMSG}5${CEND}. 成都(西南)      ${CMSG}6${CEND}. 新加坡"
+    echo -e "\t ${CMSG}7${CEND}. 香港            ${CMSG}8${CEND}. 多伦多"
+    echo -e "\t ${CMSG}9${CEND}. 法兰克福"
     read -p "Please input a number:(Default 1 press Enter) " Location
     [ -z "$Location" ] && Location=1
-    if [ ${Location} -ge 1 >/dev/null 2>&1 -a ${Location} -le 5 >/dev/null 2>&1 ]; then
+    if [ ${Location} -ge 1 >/dev/null 2>&1 -a ${Location} -le 9 >/dev/null 2>&1 ]; then
       break
     else
-      echo "${CWARNING}input error! Please only input number 1~5${CEND}"
+      echo "${CWARNING}input error! Please only input number 1~9${CEND}"
     fi
   done
-  [ "$Location" == '1' ] && region='cn-south'
-  [ "$Location" == '2' ] && region='cn-north'
-  [ "$Location" == '3' ] && region='cn-east'
-  [ "$Location" == '4' ] && region='cn-southwest'
-  [ "$Location" == '5' ] && region='sg'
+  [ "$Location" == '1' ] && region='ap-beijing-1'
+  [ "$Location" == '2' ] && region='ap-beijing'
+  [ "$Location" == '3' ] && region='ap-shanghai'
+  [ "$Location" == '4' ] && region='ap-guangzhou'
+  [ "$Location" == '5' ] && region='ap-chengdu'
+  [ "$Location" == '6' ] && region='ap-singapore'
+  [ "$Location" == '7' ] && region='ap-hongkong'
+  [ "$Location" == '8' ] && region='na-toronto'
+  [ "$Location" == '9' ] && region='eu-frankfurt'
   while :; do echo
     read -p "Please enter the Qcloud COS appid: " appid 
     [ -z "$appid" ] && continue

versions.txt

@@ -1,15 +1,15 @@
 # newest software version
 # Web
 nginx_version=1.12.1
-tengine_version=2.1.2
+tengine_version=2.1.1
 openresty_version=1.11.2.5
 openssl_version=1.0.2l
 
-tomcat8_version=8.5.20
-tomcat7_version=7.0.79
+tomcat8_version=8.5.23
+tomcat7_version=7.0.82
 tomcat6_version=6.0.53
 
-apache24_version=2.4.27
+apache24_version=2.4.28
 apache22_version=2.2.34
 pcre_version=8.41
 apr_version=1.6.2
@@ -21,14 +21,14 @@ mysql57_version=5.7.19
 mysql56_version=5.6.37
 mysql55_version=5.5.57
 
-mariadb102_version=10.2.8
-mariadb101_version=10.1.26
+mariadb102_version=10.2.9
+mariadb101_version=10.1.28
 mariadb100_version=10.0.32
 mariadb55_version=5.5.57
 
-percona57_version=5.7.18-16
-percona56_version=5.6.36-82.1
-percona55_version=5.5.55-38.8
+percona57_version=5.7.19-17
+percona56_version=5.6.37-82.2
+percona55_version=5.5.57-38.9
 
 alisql56_version=5.6.32-6
 
@@ -38,19 +38,19 @@ jdk17_version=1.7.0_80
 jdk16_version=1.6.0_45
 
 # PHP
-php71_version=7.1.9
-php70_version=7.0.23
+php71_version=7.1.10
+php70_version=7.0.24
 php56_version=5.6.31
 php55_version=5.5.38
 php54_version=5.4.45
 php53_version=5.3.29
 
 libiconv_version=1.15
-curl_version=7.55.1
+curl_version=7.56.0
 libmcrypt_version=2.5.8
 mcrypt_version=2.6.8
 mhash_version=0.9.9.9
-ImageMagick_version=6.9.9-11
+ImageMagick_version=6.9.9-19
 imagick_version=3.4.3
 GraphicsMagick_version=1.3.26
 gmagick_for_php7_version=2.0.4RC1
@@ -66,8 +66,8 @@ swoole_version=1.9.20
 pureftpd_version=1.0.46
 
 # Redis
-redis_version=4.0.1
-redis_pecl_version=3.1.3
+redis_version=4.0.2
+redis_pecl_version=3.1.4
 
 # Memcached
 memcached_version=1.5.1
@@ -90,7 +90,7 @@ libevent_version=2.0.22-stable
 tmux_version=2.5
 htop_version=2.0.2
 bison_version=2.7.1
-python_version=2.7.13
+python_version=2.7.14
 setuptools_version=32.0.0
 pip_version=9.0.1
 fail2ban_version=0.10