[feat] Update versions.txt

backup_setup.sh

@@ -271,7 +271,7 @@ if [ -n "`echo ${desc_bk} | grep -w 4`" ]; then
     echo -e "\t ${CMSG}19${CEND}. eu-frankfurt-法兰克福       ${CMSG}20${CEND}. eu-moscow-莫斯科"
     read -e -p "Please input a number:(Default 1 press Enter) " Location
     Location=${Location:-1}
-    if [[ "${Location}" =~ ^[1-9]$|^1[0-7]$ ]]; then
+    if [[ "${Location}" =~ ^[1-9]$|^1[0-9]$|^20$ ]]; then
       break
     else
       echo "${CWARNING}input error! Please only input number 1~17${CEND}"

versions.txt

@@ -16,7 +16,7 @@ apache22_ver=2.2.34
 pcre_ver=8.43
 apr_ver=1.7.0
 apr_util_ver=1.6.1
-nghttp2_ver=1.39.2
+nghttp2_ver=1.40.0
 
 # DB
 mysql80_ver=8.0.18
@@ -24,12 +24,12 @@ mysql57_ver=5.7.28
 mysql56_ver=5.6.46
 mysql55_ver=5.5.62
 
-mariadb104_ver=10.4.10
-mariadb103_ver=10.3.20
-mariadb102_ver=10.2.29
+mariadb104_ver=10.4.11
+mariadb103_ver=10.3.21
+mariadb102_ver=10.2.30
 mariadb55_ver=5.5.66
 
-percona80_ver=8.0.17-8
+percona80_ver=8.0.18-9
 percona57_ver=5.7.28-31
 percona56_ver=5.6.46-86.2
 percona55_ver=5.5.62-38.14
@@ -66,7 +66,7 @@ freetype_ver=2.10.1
 icu4c_ver=63_1
 libsodium_ver=1.0.18
 argon2_ver=20171227
-imagemagick_ver=7.0.9-6
+imagemagick_ver=7.0.9-8
 imagick_ver=3.4.4
 graphicsmagick_ver=1.3.33
 gmagick_ver=2.0.5RC1
@@ -113,7 +113,7 @@ jemalloc_ver=5.2.1
 
 # boost
 boost_ver=1.70.0
-boost_percona_ver=1.69.0
+boost_percona_ver=1.70.0
 boost_oldver=1.59.0
 
 # Others

vhost.sh

@@ -978,11 +978,11 @@ Add_Vhost() {
     Choose_ENV
     Input_Add_domain
     Nginx_anti_hotlinking
+    Nginx_rewrite
     if [ "${NGX_FLAG}" == "java" ]; then
       Nginx_log
       Create_nginx_tomcat_conf
     else
-      Nginx_rewrite
       Nginx_log
       Create_nginx_phpfpm_hhvm_conf
     fi
@@ -1000,6 +1000,7 @@ Add_Vhost() {
     Input_Add_domain
     Nginx_anti_hotlinking
     if [ "${NGX_FLAG}" == "java" ]; then
+      Nginx_rewrite
       Nginx_log
       Create_nginx_tomcat_conf
     elif [ "${NGX_FLAG}" == "hhvm" ]; then