Fix install.sh

README.md

@@ -8,7 +8,7 @@ Script properties:
 - Some security optimization
 - Providing a plurality of database versions (MySQL-8.0, MySQL-5.7, MySQL-5.6, MySQL-5.5, MariaDB-10.3, MariaDB-10.2, MariaDB-10.1, MariaDB-10.0, MariaDB-5.5, Percona-5.7, Percona-5.6, Percona-5.5, AliSQL-5.6, PostgreSQL, MongoDB)
 - Providing multiple PHP versions (PHP-7.2, PHP-7.1, PHP-7.0, PHP-5.6, PHP-5.5, PHP-5.4, PHP-5.3)
-- Provide Nginx, Tengine, OpenResty
+- Provide Nginx, Tengine, OpenResty and ngx_lua_waf
 - Providing a plurality of Tomcat version (Tomcat-9, Tomcat-8, Tomcat-7, Tomcat-6)
 - Providing a plurality of JDK version (JDK-10, JDK-1.8, JDK-1.7, JDK-1.6)
 - Providing a plurality of Apache version (Apache-2.4, Apache-2.2)

include/ngx_lua_waf.sh

@@ -49,7 +49,7 @@ Nginx_lua_waf() {
     sed -i 's@CFLAGS="$CFLAGS -g"@#CFLAGS="$CFLAGS -g"@' auto/cc/gcc # close debug
     export LUAJIT_LIB=/usr/local/lib
     export LUAJIT_INC=/usr/local/include/luajit-2.1
-    ./configure ${nginx_configure_args} --with-ld-opt='-Wl,-rpath,/usr/local/lib' --add-module=../lua-nginx-module --add-module=../ngx_devel_kit
+    ./configure ${nginx_configure_args} --with-ld-opt="-Wl,-rpath,/usr/local/lib" --add-module=../lua-nginx-module --add-module=../ngx_devel_kit
     make -j ${THREAD}
     if [ -f "objs/nginx" ]; then
       /bin/mv ${nginx_install_dir}/sbin/nginx{,`date +%m%d`}
@@ -59,6 +59,7 @@ Nginx_lua_waf() {
       kill -QUIT `cat /var/run/nginx.pid.oldbin`
       popd > /dev/null
       echo "${CSUCCESS}lua-nginx-module installed successfully! ${CEND}"
+      sed -i "s@^nginx_modules_options='\(.*\)'@nginx_modules_options=\'\1 --with-ld-opt=\"-Wl,-rpath,/usr/local/lib\" --add-module=../lua-nginx-module --add-module=../ngx_devel_kit\'@" ../options.conf
       rm -rf nginx-${nginx_ver}
     else
       echo "${CFAILURE}lua-nginx-module install failed! ${CEND}"
@@ -109,7 +110,7 @@ Tengine_lua_waf() {
     sed -i 's@CFLAGS="$CFLAGS -g"@#CFLAGS="$CFLAGS -g"@' auto/cc/gcc # close debug
     export LUAJIT_LIB=/usr/local/lib
     export LUAJIT_INC=/usr/local/include/luajit-2.1
-    ./configure ${tengine_configure_args} --with-ld-opt='-Wl,-rpath,/usr/local/lib' --add-module=../lua-nginx-module --add-module=../ngx_devel_kit
+    ./configure ${tengine_configure_args} --with-ld-opt="-Wl,-rpath,/usr/local/lib" --add-module=../lua-nginx-module --add-module=../ngx_devel_kit
     make -j ${THREAD}
     if [ -f "objs/nginx" ]; then
       /bin/mv ${tengine_install_dir}/sbin/nginx{,`date +%m%d`}
@@ -123,6 +124,7 @@ Tengine_lua_waf() {
       sleep 1
       kill -QUIT `cat /var/run/nginx.pid.oldbin`
       popd > /dev/null
+      sed -i "s@^nginx_modules_options='\(.*\)'@nginx_modules_options=\'\1 --with-ld-opt=\"-Wl,-rpath,/usr/local/lib\" --add-module=../lua-nginx-module --add-module=../ngx_devel_kit\'@" ../options.conf
       echo "${CSUCCESS}lua_module installed successfully! ${CEND}"
       rm -rf tengine-${tengine_ver}
     else

install.sh

@@ -97,7 +97,7 @@ while :; do
       php_option=$2; shift 2
       [[ ! ${php_option} =~ ^[1-7]$ ]] && { echo "${CWARNING}php_option input error! Please only input number 1~7${CEND}"; exit 1; }
       php_yn=y
-      [ -e "${php_install_dir}/bin/phpize" ] && { echo "${CWARNING}PHP already installed! ${CEND}"; php_yn=Other; }
+      [ -e "${php_install_dir}/bin/phpize" ] && { echo "${CWARNING}PHP already installed! ${CEND}"; php_option=Other; }
       ;;
     --phpcache_option)
       phpcache_option=$2; shift 2
@@ -123,11 +123,11 @@ while :; do
       db_option=$2; shift 2
       db_yn=y
       if [[ "${db_option}" =~ ^[1-9]$|^1[0-3]$ ]]; then
-        [ -d "${db_install_dir}/support-files" ] && { echo "${CWARNING}MySQL already installed! ${CEND}"; db_yn=Other; }
+        [ -d "${db_install_dir}/support-files" ] && { echo "${CWARNING}MySQL already installed! ${CEND}"; db_option=Other; }
       elif [ "${db_option}" == '14' ]; then
-        [ -e "${pgsql_install_dir}/bin/psql" ] && { echo "${CWARNING}PostgreSQL already installed! ${CEND}"; db_yn=Other; }
+        [ -e "${pgsql_install_dir}/bin/psql" ] && { echo "${CWARNING}PostgreSQL already installed! ${CEND}"; db_option=Other; }
       elif [ "${db_option}" == '15' ]; then
-        [ -e "${mongo_install_dir}/bin/mongo" ] && { echo "${CWARNING}MongoDB already installed! ${CEND}"; db_yn=Other; }
+        [ -e "${mongo_install_dir}/bin/mongo" ] && { echo "${CWARNING}MongoDB already installed! ${CEND}"; db_option=Other; }
       else
         echo "${CWARNING}db_option input error! Please only input number 1~15${CEND}"
         exit 1
@@ -360,11 +360,11 @@ if [ ${ARG_NUM} == 0 ]; then
           [[ "${db_option}" =~ ^5$|^15$ ]] && [ "${OS_BIT}" == '32' ] && { echo "${CWARNING}By not supporting 32-bit! ${CEND}"; continue; }
           if [[ "${db_option}" =~ ^[1-9]$|^1[0-5]$ ]]; then
             if [ "${db_option}" == '14' ]; then
-              [ -e "${pgsql_install_dir}/bin/psql" ] && { echo "${CWARNING}PostgreSQL already installed! ${CEND}"; db_yn=Other; break; }
+              [ -e "${pgsql_install_dir}/bin/psql" ] && { echo "${CWARNING}PostgreSQL already installed! ${CEND}"; db_option=Other; break; }
             elif [ "${db_option}" == '15' ]; then
-              [ -e "${mongo_install_dir}/bin/mongo" ] && { echo "${CWARNING}MongoDB already installed! ${CEND}"; db_yn=Other; break; }
+              [ -e "${mongo_install_dir}/bin/mongo" ] && { echo "${CWARNING}MongoDB already installed! ${CEND}"; db_option=Other; break; }
             else
-              [ -d "${db_install_dir}/support-files" ] && { echo "${CWARNING}MySQL already installed! ${CEND}"; db_yn=Other; break; }
+              [ -d "${db_install_dir}/support-files" ] && { echo "${CWARNING}MySQL already installed! ${CEND}"; db_option=Other; break; }
             fi
             while :; do
               if [ "${db_option}" == '14' ]; then
@@ -424,7 +424,7 @@ if [ ${ARG_NUM} == 0 ]; then
       echo "${CWARNING}input error! Please only input 'y' or 'n'${CEND}"
     else
       if [ "${php_yn}" == 'y' ]; then
-        [ -e "${php_install_dir}/bin/phpize" ] && { echo "${CWARNING}PHP already installed! ${CEND}"; php_yn=Other; break; }
+        [ -e "${php_install_dir}/bin/phpize" ] && { echo "${CWARNING}PHP already installed! ${CEND}"; php_option=Other; break; }
         while :; do echo
           echo 'Please select a version of the PHP:'
           echo -e "\t${CMSG}1${CEND}. Install php-5.3"

ss.sh

@@ -135,9 +135,9 @@ Install_SS-python() {
 }
 
 Install_SS-libev() {
-  src_url=http://mirrors.linuxeye.com/oneinstack/src/shadowsocks-libev-3.1.3.tar.gz && Download_src
+  src_url=http://mirrors.linuxeye.com/oneinstack/src/shadowsocks-libev-3.2.0.tar.gz && Download_src
   src_url=http://mirrors.linuxeye.com/oneinstack/src/libsodium-${libsodium_ver}.tar.gz && Download_src
-  src_url=http://mirrors.linuxeye.com/oneinstack/src/mbedtls-2.8.0-apache.tgz && Download_src
+  src_url=http://mirrors.linuxeye.com/oneinstack/src/mbedtls-2.11.0-apache.tgz && Download_src
   if [ ! -e "/usr/local/lib/libsodium.la" ]; then
     tar xzf libsodium-${libsodium_ver}.tar.gz
     pushd libsodium-${libsodium_ver}
@@ -146,13 +146,13 @@ Install_SS-libev() {
     popd
     rm -rf libsodium-${libsodium_ver}
   fi
-  tar xzf mbedtls-2.8.0-apache.tgz
-  pushd mbedtls-2.8.0
+  tar xzf mbedtls-2.11.0-apache.tgz
+  pushd mbedtls-2.11.0
   make SHARED=1 CFLAGS=-fPIC
   make DESTDIR=/usr install
   popd
-  tar xzf shadowsocks-libev-3.1.3.tar.gz
-  pushd shadowsocks-libev-3.1.3
+  tar xzf shadowsocks-libev-3.2.0.tar.gz
+  pushd shadowsocks-libev-3.2.0
   make clean
   ./configure
   make -j ${THREAD} && make install

versions.txt

@@ -7,7 +7,7 @@ openssl_ver=1.0.2o
 
 tomcat9_ver=9.0.10
 tomcat8_ver=8.5.32
-tomcat7_ver=7.0.88
+tomcat7_ver=7.0.90
 tomcat6_ver=6.0.53
 
 apache24_ver=2.4.33
@@ -23,7 +23,7 @@ mysql57_ver=5.7.22
 mysql56_ver=5.6.40
 mysql55_ver=5.5.60
 
-mariadb103_ver=10.3.7
+mariadb103_ver=10.3.8
 mariadb102_ver=10.2.16
 mariadb101_ver=10.1.34
 mariadb100_ver=10.0.35
@@ -61,7 +61,7 @@ mcrypt_ver=2.6.8
 mhash_ver=0.9.9.9
 libsodium_ver=1.0.16
 argon2_ver=20171227
-imagemagick_ver=6.9.10-2
+imagemagick_ver=6.9.10-5
 imagick_ver=3.4.3
 graphicsmagick_ver=1.3.28
 gmagick_for_php7_ver=2.0.5RC1
@@ -82,14 +82,14 @@ redis_ver=4.0.10
 redis_pecl_ver=4.0.2
 
 # Memcached
-memcached_ver=1.5.8
+memcached_ver=1.5.9
 libmemcached_ver=1.0.18
 memcached_pecl_ver=2.2.0
 memcached_pecl_php7_ver=3.0.4
 memcache_pecl_ver=3.0.8
 
 # MongoDB
-mongodb_pecl_ver=1.4.4
+mongodb_pecl_ver=1.5.0
 mongo_pecl_ver=1.6.16
 
 # phpMyadmin