[fix] Update ssl

include/ImageMagick.sh

@@ -14,6 +14,11 @@ Install_ImageMagick() {
   else
     pushd ${oneinstack_dir}/src > /dev/null
     tar xzf ImageMagick-${imagemagick_ver}.tar.gz
+    #if [ "${PM}" == 'yum' ]; then
+    #  yum -y install libwebp-devel
+    #else if [ "${PM}" == 'apt-get' ]; then
+    #  yum -y install libwebp-dev
+    #fi
     pushd ImageMagick-${imagemagick_ver} > /dev/null
     ./configure --prefix=${imagick_install_dir} --enable-shared --enable-static
     make -j ${THREAD} && make install
@@ -25,7 +30,7 @@ Install_ImageMagick() {
 
 Uninstall_ImageMagick() {
   if [ -d "${imagick_install_dir}" ]; then
-    rm -rf ${imagick_install_dir} 
+    rm -rf ${imagick_install_dir}
     echo; echo "${CMSG}ImageMagick uninstall completed${CEND}"
   fi
 }

include/upgrade_web.sh

@@ -25,8 +25,12 @@ Upgrade_Nginx() {
       if [ -e "nginx-${NEW_nginx_ver}.tar.gz" ]; then
         src_url=https://www.openssl.org/source/openssl-${openssl11_ver}.tar.gz && Download_src
         src_url=http://mirrors.linuxeye.com/oneinstack/src/pcre-${pcre_ver}.tar.gz && Download_src
+        src_url=http://mirrors.linuxeye.com/oneinstack/src/ngx_devel_kit.tar.gz && Download_src
+        src_url=http://mirrors.linuxeye.com/oneinstack/src/lua-nginx-module-${lua_nginx_module_ver}.tar.gz && Download_src
         tar xzf openssl-${openssl11_ver}.tar.gz
         tar xzf pcre-${pcre_ver}.tar.gz
+        tar xzf ngx_devel_kit.tar.gz
+        tar xzf lua-nginx-module-${lua_nginx_module_ver}.tar.gz
         echo "Download [${CMSG}nginx-${NEW_nginx_ver}.tar.gz${CEND}] successfully! "
         break
       else
@@ -51,7 +55,7 @@ Upgrade_Nginx() {
     ${nginx_install_dir}/sbin/nginx -V &> $$
     nginx_configure_args_tmp=`cat $$ | grep 'configure arguments:' | awk -F: '{print $2}'`
     rm -rf $$
-    nginx_configure_args=`echo ${nginx_configure_args_tmp} | sed "s@--with-openssl=../openssl-\w.\w.\w\+ @--with-openssl=../openssl-${openssl11_ver} @" | sed "s@--with-pcre=../pcre-\w.\w\+ @--with-pcre=../pcre-${pcre_ver} @"`
+    nginx_configure_args=`echo ${nginx_configure_args_tmp} | sed "s@lua-nginx-module-\w.\w\+.\w\+ @lua-nginx-module-${lua_nginx_module_ver} @" | sed "s@lua-nginx-module @lua-nginx-module-${lua_nginx_module_ver} @" | sed "s@--with-openssl=../openssl-\w.\w.\w\+ @--with-openssl=../openssl-${openssl11_ver} @" | sed "s@--with-pcre=../pcre-\w.\w\+ @--with-pcre=../pcre-${pcre_ver} @"`
     export LUAJIT_LIB=/usr/local/lib
     export LUAJIT_INC=/usr/local/include/luajit-2.1
     ./configure ${nginx_configure_args}

init.d/nginx.service

@@ -11,6 +11,7 @@ ExecStartPre=/usr/local/nginx/sbin/nginx -t -c /usr/local/nginx/conf/nginx.conf
 ExecStart=/usr/local/nginx/sbin/nginx -c /usr/local/nginx/conf/nginx.conf
 ExecReload=/bin/kill -s HUP $MAINPID
 ExecStop=/bin/kill -s QUIT $MAINPID
+TimeoutStartSec=120
 LimitNOFILE=1000000
 LimitNPROC=1000000
 LimitCORE=1000000

versions.txt

@@ -6,9 +6,9 @@ openresty_ver=1.19.3.2
 openssl11_ver=1.1.1k
 openssl_ver=1.0.2u
 
-tomcat10_ver=10.0.6
-tomcat9_ver=9.0.46
-tomcat8_ver=8.5.66
+tomcat10_ver=10.0.7
+tomcat9_ver=9.0.48
+tomcat8_ver=8.5.68
 tomcat7_ver=7.0.109
 
 apache_ver=2.4.48
@@ -23,9 +23,9 @@ mysql57_ver=5.7.34
 mysql56_ver=5.6.50
 mysql55_ver=5.5.62
 
-mariadb105_ver=10.5.10
-mariadb104_ver=10.4.19
-mariadb103_ver=10.3.29
+mariadb105_ver=10.5.11
+mariadb104_ver=10.4.20
+mariadb103_ver=10.3.30
 mariadb55_ver=5.5.68
 
 percona80_ver=8.0.23-14
@@ -56,7 +56,7 @@ php74_ver=7.4.20
 php80_ver=8.0.7
 
 # Nodejs
-node_ver=14.17.0
+node_ver=14.17.1
 
 libiconv_ver=1.16
 curl_ver=7.77.0
@@ -68,7 +68,7 @@ icu4c_ver=63_1
 libsodium_ver=1.0.18
 libzip_ver=1.2.0
 argon2_ver=20171227
-imagemagick_ver=7.0.11-14
+imagemagick_ver=7.1.0-2
 imagick_ver=3.4.4
 graphicsmagick_ver=1.3.36
 gmagick_ver=2.0.5RC1

vhost.sh

@@ -176,6 +176,18 @@ If you enter '.', the field will be left blank.
     openssl req -utf8 -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 "${dnsapi_flag}" == 'y' ]; then
+    if [ ! -e ~/.acme.sh/ca/acme.zerossl.com/account.key ]; then
+      while :; do echo
+        read -e -p "Please enter your email: " Email
+        echo
+        if [[ $Email =~ ^[A-Za-z0-9._-]+@[A-Za-z0-9._-]+\.[A-Za-z]{2,4}$ ]]; then
+          break
+        else
+          echo "${CWARNING}input error!${CEND}"
+        fi
+      done
+      ~/.acme.sh/acme.sh --register-account -m $Email
+    fi
     if [ "${moredomain}" == "*.${domain}" -o "${dnsapi_flag}" == 'y' ]; then
       while :; do echo
         echo 'Please select DNS provider:'