Update versions.txt

addons.sh

@@ -427,9 +427,9 @@ What Are You Doing?
             tar xzf swoole-${swoole_ver}.tgz
             pushd swoole-${swoole_ver}
           else
-            src_url=https://pecl.php.net/get/swoole-1.10.2.tgz && Download_src
-            tar xzf swoole-1.10.2.tgz
-            pushd swoole-1.10.2
+            src_url=https://pecl.php.net/get/swoole-1.10.3.tgz && Download_src
+            tar xzf swoole-1.10.3.tgz
+            pushd swoole-1.10.3
           fi
           ${php_install_dir}/bin/phpize
           ./configure --with-php-config=${php_install_dir}/bin/php-config

include/tomcat-9.sh

@@ -40,7 +40,7 @@ Install_Tomcat9() {
   pushd ${tomcat_install_dir}/lib/catalina
   jar xf ../catalina.jar
   sed -i 's@^server.info=.*@server.info=Tomcat@' org/apache/catalina/util/ServerInfo.properties
-  sed -i 's@^server.number=.*@server.number=8@' org/apache/catalina/util/ServerInfo.properties
+  sed -i 's@^server.number=.*@server.number=9@' org/apache/catalina/util/ServerInfo.properties
   sed -i "s@^server.built=.*@server.built=$(date)@" org/apache/catalina/util/ServerInfo.properties
   jar cf ../catalina.jar ./*
   popd

versions.txt

@@ -5,8 +5,8 @@ tengine_ver=2.2.2
 openresty_ver=1.13.6.1
 openssl_ver=1.0.2o
 
-tomcat9_ver=9.0.6
-tomcat8_ver=8.5.29
+tomcat9_ver=9.0.7
+tomcat8_ver=8.5.30
 tomcat7_ver=7.0.85
 tomcat6_ver=6.0.53
 
@@ -47,7 +47,7 @@ jdk16_ver=1.6.0_45
 php72_ver=7.2.4
 php71_ver=7.1.16
 php70_ver=7.0.29
-php56_ver=5.6.34
+php56_ver=5.6.35
 php55_ver=5.5.38
 php54_ver=5.4.45
 php53_ver=5.3.29

vhost.sh

@@ -19,6 +19,7 @@ printf "
 # Check if user is root
 [ $(id -u) != '0' ] && { echo "${CFAILURE}Error: You must be root to run this script${CEND}"; exit 1; }
 
+ARG1=$1
 oneinstack_dir=$(dirname "`readlink -f $0`")
 pushd ${oneinstack_dir} > /dev/null
 . ./options.conf
@@ -168,7 +169,7 @@ If you enter '.', the field will be left blank.
 
     openssl req -new -newkey rsa:2048 -sha256 -nodes -out ${PATH_SSL}/${domain}.csr -keyout ${PATH_SSL}/${domain}.key -subj "/C=${SELFSIGNEDSSL_C}/ST=${SELFSIGNEDSSL_ST}/L=${SELFSIGNEDSSL_L}/O=${SELFSIGNEDSSL_O}/OU=${SELFSIGNEDSSL_OU}/CN=${domain}" > /dev/null 2>&1
     openssl x509 -req -days 36500 -sha256 -in ${PATH_SSL}/${domain}.csr -signkey ${PATH_SSL}/${domain}.key -out ${PATH_SSL}/${domain}.crt > /dev/null 2>&1
-  elif [ "${Domian_Mode}" == '3' -o "$1" == 'dnsapi' ]; then
+  elif [ "${Domian_Mode}" == '3' -o "${ARG1}" == 'dnsapi' ]; then
     echo "${CMSG}More: https://oneinstack.com/faq/letsencrypt${CEND}"
     if [ "${moredomain}" == "*.${domain}" ]; then
       while :; do echo
@@ -252,14 +253,14 @@ Print_ssl() {
     echo "$(printf "%-30s" "Self-signed SSL Certificate:")${CMSG}${PATH_SSL}/${domain}.crt${CEND}"
     echo "$(printf "%-30s" "SSL Private Key:")${CMSG}${PATH_SSL}/${domain}.key${CEND}"
     echo "$(printf "%-30s" "SSL CSR File:")${CMSG}${PATH_SSL}/${domain}.csr${CEND}"
-  elif [ "${Domian_Mode}" == '3' -o "$1" == 'dnsapi' ]; then
+  elif [ "${Domian_Mode}" == '3' -o "${ARG1}" == 'dnsapi' ]; then
     echo "$(printf "%-30s" "Let's Encrypt SSL Certificate:")${CMSG}${PATH_SSL}/${domain}.crt${CEND}"
     echo "$(printf "%-30s" "SSL Private Key:")${CMSG}${PATH_SSL}/${domain}.key${CEND}"
   fi
 }
 
 Input_Add_domain() {
-  if [ "$1" != 'dnsapi' ]; then
+  if [ "${ARG1}" != 'dnsapi' ]; then
     while :;do
       printf "
 What Are You Doing?
@@ -276,7 +277,7 @@ What Are You Doing?
       fi
     done
   fi
-  if [ "${Domian_Mode}" == '3' -o "$1" == 'dnsapi' ] && [ ! -e ~/.acme.sh/acme.sh ]; then
+  if [ "${Domian_Mode}" == '3' -o "${ARG1}" == 'dnsapi' ] && [ ! -e ~/.acme.sh/acme.sh ]; then
     pushd ${oneinstack_dir}/src > /dev/null
     [ ! -e acme.sh-master.tar.gz ] && wget -qc http://mirrors.linuxeye.com/oneinstack/src/acme.sh-master.tar.gz
     tar xzf acme.sh-master.tar.gz
@@ -285,7 +286,7 @@ What Are You Doing?
     popd > /dev/null
     popd > /dev/null
   fi
-  if [[ "${Domian_Mode}" =~ ^[2-3]$ ]] || [ "$1" == 'dnsapi' ]; then
+  if [[ "${Domian_Mode}" =~ ^[2-3]$ ]] || [ "${ARG1}" == 'dnsapi' ]; then
     if [ -e "${web_install_dir}/sbin/nginx" ]; then
       nginx_ssl_flag=y
       PATH_SSL=${web_install_dir}/conf/ssl
@@ -1049,7 +1050,7 @@ List_Vhost() {
 if [ $# == 0 ]; then
   Add_Vhost
 elif [ $# == 1 ]; then
-  case $1 in
+  case ${ARG1} in
   add|dnsapi)
     Add_Vhost
     ;;