Update versions.txt

addons.sh

@@ -101,6 +101,7 @@ Uninstall_succ() {
 
 Install_letsencrypt() {
   [ ! -e "${python_install_dir}/bin/python" ] && Install_Python
+  ${python_install_dir}/bin/pip install requests 
   ${python_install_dir}/bin/pip install certbot
   if [ -e "${python_install_dir}/bin/certbot" ]; then
     echo; echo "${CSUCCESS}Let's Encrypt client installed successfully! ${CEND}"

include/ImageMagick.sh

@@ -23,13 +23,8 @@ Install_php-imagick() {
   pushd ${oneinstack_dir}/src
   if [ -e "${php_install_dir}/bin/phpize" ]; then
     phpExtensionDir=`${php_install_dir}/bin/php-config --extension-dir`
-    if [ "`${php_install_dir}/bin/php -r 'echo PHP_VERSION;' | awk -F. '{print $1"."$2}'`" == '5.3' ]; then
-      tar xzf imagick-${imagick_for_php53_version}.tgz
-      pushd imagick-${imagick_for_php53_version}
-    else
-      tar xzf imagick-${imagick_version}.tgz
-      pushd imagick-${imagick_version}
-    fi
+    tar xzf imagick-${imagick_version}.tgz
+    pushd imagick-${imagick_version}
     export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
     ${php_install_dir}/bin/phpize
     ./configure --with-php-config=${php_install_dir}/bin/php-config --with-imagick=/usr/local/imagemagick
@@ -38,7 +33,7 @@ Install_php-imagick() {
     if [ -f "${phpExtensionDir}/imagick.so" ]; then
       echo 'extension=imagick.so' > ${php_install_dir}/etc/php.d/ext-imagick.ini
       echo "${CSUCCESS}PHP imagick module installed successfully! ${CEND}"
-      rm -rf imagick-${imagick_for_php53_version} imagick-${imagick_version}
+      rm -rf imagick-${imagick_version}
     else
       echo "${CFAILURE}PHP imagick module install failed, Please contact the author! ${CEND}"
     fi

include/check_download.sh

@@ -666,13 +666,8 @@ checkDownload() {
     if [ "${Magick}" == '1' ]; then
       echo "Download ImageMagick..."
       src_url=${mirrorLink}/ImageMagick-${ImageMagick_version}.tar.gz && Download_src
-      if [ "${PHP_version}" == '1' ]; then
-        echo "Download image for php 5.3..."
-        src_url=https://pecl.php.net/get/imagick-${imagick_for_php53_version}.tgz && Download_src
-      else
-        echo "Download imagick..."
-        src_url=http://pecl.php.net/get/imagick-${imagick_version}.tgz && Download_src
-      fi
+      echo "Download imagick..."
+      src_url=http://pecl.php.net/get/imagick-${imagick_version}.tgz && Download_src
     else
       echo "Download graphicsmagick..."
       src_url=http://downloads.sourceforge.net/project/graphicsmagick/graphicsmagick/${GraphicsMagick_version}/GraphicsMagick-${GraphicsMagick_version}.tar.gz && Download_src
@@ -699,18 +694,12 @@ checkDownload() {
   if [ "${redis_yn}" == 'y' ]; then
     echo "Download redis..."
     src_url=http://download.redis.io/releases/redis-${redis_version}.tar.gz && Download_src
+    echo "Download redis pecl..."
+    src_url=http://pecl.php.net/get/redis-${redis_pecl_version}.tgz && Download_src
     if [ "${OS}" == "CentOS" ]; then
       echo "Download start-stop-daemon.c for CentOS..."
       src_url=${mirrorLink}/start-stop-daemon.c && Download_src
     fi
-    # redis addon
-    if [[ "$PHP_version" =~ ^[5-6]$ ]]; then
-      echo "Download redis pecl for php 7.x..."
-      src_url=http://pecl.php.net/get/redis-${redis_pecl_for_php7_version}.tgz && Download_src
-    else
-      echo "Download redis pecl..."
-      src_url=http://pecl.php.net/get/redis-${redis_pecl_version}.tgz && Download_src
-    fi
   fi
 
   if [ "${memcached_yn}" == 'y' ]; then

include/ioncube.sh

@@ -25,6 +25,10 @@ Install_ionCube() {
 
   [ ! -d "${phpExtensionDir}" ] && mkdir -p ${phpExtensionDir}
   case "${PHP_main_version}" in
+    7.1)
+      /bin/cp ioncube/ioncube_loader_lin_7.1.so ${phpExtensionDir}
+      zend_extension="${phpExtensionDir}/ioncube_loader_lin_7.1.so"
+      ;;
     7.0)
       /bin/cp ioncube/ioncube_loader_lin_7.0.so ${phpExtensionDir}
       zend_extension="${phpExtensionDir}/ioncube_loader_lin_7.0.so"

include/redis.sh

@@ -59,13 +59,8 @@ Install_php-redis() {
   pushd ${oneinstack_dir}/src
   if [ -e "${php_install_dir}/bin/phpize" ]; then
     phpExtensionDir=`${php_install_dir}/bin/php-config --extension-dir`
-    if [ "`${php_install_dir}/bin/php -r 'echo PHP_VERSION;' | awk -F. '{print $1}'`" == '7' ]; then
-      tar xzf redis-${redis_pecl_for_php7_version}.tgz
-      pushd redis-${redis_pecl_for_php7_version}
-    else
-      tar xzf redis-$redis_pecl_version.tgz
-      pushd redis-$redis_pecl_version
-    fi
+    tar xzf redis-$redis_pecl_version.tgz
+    pushd redis-$redis_pecl_version
     ${php_install_dir}/bin/phpize
     ./configure --with-php-config=${php_install_dir}/bin/php-config
     make -j ${THREAD} && make install
@@ -73,7 +68,7 @@ Install_php-redis() {
       echo 'extension=redis.so' > ${php_install_dir}/etc/php.d/ext-redis.ini
       echo "${CSUCCESS}PHP Redis module installed successfully! ${CEND}"
       popd
-      rm -rf redis-${redis_pecl_for_php7_version} redis-$redis_pecl_version
+      rm -rf redis-$redis_pecl_version
     else
       echo "${CFAILURE}PHP Redis module install failed, Please contact the author! ${CEND}"
     fi

install.sh

@@ -345,7 +345,7 @@ while :; do echo
           fi
 
           # ionCube
-          if [ "${TARGET_ARCH}" != "arm64" -a "$PHP_version" != '6' ]; then
+          if [ "${TARGET_ARCH}" != "arm64" ]; then
             while :; do echo
               read -p "Do you want to install ionCube? [y/n]: " ionCube_yn
               if [[ ! $ionCube_yn =~ ^[y,n]$ ]]; then

ss.sh

@@ -105,7 +105,7 @@ Def_parameter() {
     done
     AddUser_SS
     Iptables_set
-    pkgList="wget unzip openssl-devel gcc swig autoconf libtool libevent automake make curl curl-devel zlib-devel perl perl-devel cpio expat-devel gettext-devel git asciidoc xmlto pcre-devel mbedtls-devel udns-devel libev-devel"
+    pkgList="wget unzip openssl-devel gcc swig autoconf libtool libevent automake make curl curl-devel zlib-devel perl perl-devel cpio expat-devel gettext-devel git asciidoc xmlto pcre-devel mbedtls-devel udns-devel libev-devel libsodium"
     for Package in ${pkgList}; do
       yum -y install ${Package}
     done

versions.txt

@@ -5,7 +5,7 @@ tengine_version=2.1.2
 openresty_version=1.11.2.4
 openssl_version=1.0.2l
 
-tomcat8_version=8.5.16
+tomcat8_version=8.5.20
 tomcat7_version=7.0.79
 tomcat6_version=6.0.53
 
@@ -22,15 +22,15 @@ mysql56_version=5.6.37
 mysql55_version=5.5.57
 
 mariadb102_version=10.2.7
-mariadb101_version=10.1.25
-mariadb100_version=10.0.31
+mariadb101_version=10.1.26
+mariadb100_version=10.0.32
 mariadb55_version=5.5.57
 
-percona57_version=5.7.18-15
-percona56_version=5.6.36-82.0
+percona57_version=5.7.18-16
+percona56_version=5.6.36-82.1
 percona55_version=5.5.55-38.8
 
-alisql56_version=5.6.32-5
+alisql56_version=5.6.32-6
 
 # JDK
 jdk18_version=1.8.0_141
@@ -38,8 +38,8 @@ jdk17_version=1.7.0_80
 jdk16_version=1.6.0_45
 
 # PHP
-php71_version=7.1.7
-php70_version=7.0.21
+php71_version=7.1.8
+php70_version=7.0.22
 php56_version=5.6.31
 php55_version=5.5.38
 php54_version=5.4.45
@@ -49,9 +49,8 @@ zendopcache_version=7.0.5
 xcache_version=3.2.0
 apcu_version=4.0.11
 apcu_for_php7_version=5.1.8
-ImageMagick_version=6.9.9-3
+ImageMagick_version=6.9.9-7
 imagick_version=3.4.3
-imagick_for_php53_version=3.3.0
 GraphicsMagick_version=1.3.26
 gmagick_for_php7_version=2.0.4RC1
 gmagick_version=1.1.7RC3
@@ -67,8 +66,7 @@ pureftpd_version=1.0.46
 
 # Redis
 redis_version=4.0.1
-redis_pecl_for_php7_version=3.1.3
-redis_pecl_version=2.2.8
+redis_pecl_version=3.1.3
 
 # Memcached
 memcached_version=1.5.0

vhost.sh

@@ -438,14 +438,15 @@ Nginx_rewrite() {
   else
     echo
     echo "Please input the rewrite of programme :"
-    echo "${CMSG}wordpress${CEND},${CMSG}opencart${CEND},${CMSG}magento2${CEND},${CMSG}drupal${CEND},${CMSG}joomla${CEND},${CMSG}laravel${CEND},${CMSG}thinkphp${CEND},${CMSG}discuz${CEND},${CMSG}typecho${CEND},${CMSG}ecshop${CEND} rewrite was exist."
+    echo "${CMSG}wordpress${CEND},${CMSG}opencart${CEND},${CMSG}magento2${CEND},${CMSG}drupal${CEND},${CMSG}joomla${CEND},${CMSG}laravel${CEND},${CMSG}thinkphp${CEND},${CMSG}pathinfo${CEND},${CMSG}discuz${CEND},${CMSG}typecho${CEND},${CMSG}ecshop${CEND} rewrite was exist."
     read -p "(Default rewrite: other): " rewrite
     if [ "${rewrite}" == "" ]; then
       rewrite="other"
     fi
     echo "You choose rewrite=${CMSG}$rewrite${CEND}"
-    [ "${NGX_FLAG}" == 'php' -a "${rewrite}" == "thinkphp" ] && NGX_CONF=$(echo -e "location ~ [^/]\.php(/|$) {\n    #fastcgi_pass remote_php_ip:9000;\n    fastcgi_pass unix:/dev/shm/php-cgi.sock;\n    fastcgi_index index.php;\n    include fastcgi.conf;\n    fastcgi_split_path_info ^(.+?\.php)(/.*)\$;\n    set \$path_info \$fastcgi_path_info;\n    fastcgi_param PATH_INFO \$path_info;\n    try_files \$fastcgi_script_name =404;\n  }")
-    if [ "${rewrite}" != 'magento2' ]; then
+    [ "${NGX_FLAG}" == 'php' -a "${rewrite}" == "thinkphp" ] && NGX_CONF=$(echo -e "location ~ \.php {\n    #fastcgi_pass remote_php_ip:9000;\n    fastcgi_pass unix:/dev/shm/php-cgi.sock;\n    fastcgi_index index.php;\n    include fastcgi_params;\n    set \$real_script_name \$fastcgi_script_name;\n    if (\$fastcgi_script_name ~ \"^(.+?\.php)(/.+)\$\") {\n      set \$real_script_name \$1;\n      #set \$path_info \$2;\n    }\n    fastcgi_param SCRIPT_FILENAME \$document_root\$real_script_name;\n    fastcgi_param SCRIPT_NAME \$real_script_name;\n    #fastcgi_param PATH_INFO \$path_info;\n  }")
+    [ "${NGX_FLAG}" == 'php' -a "${rewrite}" == "pathinfo" ] && NGX_CONF=$(echo -e "location / {\n    if (!-e \$request_filename) {\n      rewrite ^(.*)\$ /index.php?s=\$1 last;\n      break;\n    }\n  }\n\n  location ~ [^/]\.php(/|$) {\n    #fastcgi_pass remote_php_ip:9000;\n    fastcgi_pass unix:/dev/shm/php-cgi.sock;\n    fastcgi_index index.php;\n    include fastcgi.conf;\n    fastcgi_split_path_info ^(.+?\.php)(/.*)\$;\n    set \$path_info \$fastcgi_path_info;\n    fastcgi_param PATH_INFO \$path_info;\n    try_files \$fastcgi_script_name =404;\n  }")
+    if [ "${rewrite}" != 'magento2' -a "${rewrite}" != 'pathinfo' ]; then
       if [ -e "config/${rewrite}.conf" ]; then
         /bin/cp config/${rewrite}.conf ${web_install_dir}/conf/rewrite/${rewrite}.conf
       else
@@ -578,6 +579,7 @@ server {
   #error_page 502 /502.html;
   ${anti_hotlinking}
   ${NGX_CONF}
+
   location ~ .*\.(gif|jpg|jpeg|png|bmp|swf|flv|mp4|ico)$ {
     expires 30d;
     access_log off;
@@ -592,6 +594,7 @@ server {
 }
 EOF
 
+  [ "${rewrite}" == 'pathinfo' ] && sed -i '/pathinfo.conf;$/d' ${web_install_dir}/conf/vhost/${domain}.conf
   if [ "${rewrite}" == 'magento2' -a -e "config/${rewrite}.conf" ]; then
     /bin/cp config/${rewrite}.conf ${web_install_dir}/conf/vhost/${domain}.conf
     sed -i "s@^  set \$MAGE_ROOT.*;@  set \$MAGE_ROOT ${vhostdir};@" ${web_install_dir}/conf/vhost/${domain}.conf
@@ -602,7 +605,7 @@ EOF
       sed -i "s@^  root.*;@&\n  }@" ${web_install_dir}/conf/vhost/${domain}.conf
       sed -i "s@^  root.*;@&\n    }@" ${web_install_dir}/conf/vhost/${domain}.conf
       sed -i "s@^  root.*;@&\n      return 403;@" ${web_install_dir}/conf/vhost/${domain}.conf
-      sed -i "s@^  root.*;@&\n      rewrite ^/ http://www.linuxeye.com/403.html;@" ${web_install_dir}/conf/vhost/${domain}.conf
+      sed -i "s@^  root.*;@&\n      rewrite ^/ http://www.example.com/403.html;@" ${web_install_dir}/conf/vhost/${domain}.conf
       sed -i "s@^  root.*;@&\n    if (\$invalid_referer) {@" ${web_install_dir}/conf/vhost/${domain}.conf
       sed -i "s@^  root.*;@&\n    valid_referers none blocked ${domain_allow_all};@" ${web_install_dir}/conf/vhost/${domain}.conf
       sed -i "s@^  root.*;@&\n  location ~ .*\.(wma|wmv|asf|mp3|mmf|zip|rar|jpg|gif|png|swf|flv|mp4)\$ {@" ${web_install_dir}/conf/vhost/${domain}.conf
@@ -648,7 +651,7 @@ EOF
   echo "$(printf "%-30s" "Your domain:")${CMSG}${domain}${CEND}"
   echo "$(printf "%-30s" "Virtualhost conf:")${CMSG}${web_install_dir}/conf/vhost/${domain}.conf${CEND}"
   echo "$(printf "%-30s" "Directory of:")${CMSG}${vhostdir}${CEND}"
-  [ "${rewrite_yn}" == 'y' -a "${rewrite}" != 'magento2' ] && echo "$(printf "%-30s" "Rewrite rule:")${CMSG}${web_install_dir}/conf/rewrite/${rewrite}.conf${CEND}"
+  [ "${rewrite_yn}" == 'y' -a "${rewrite}" != 'magento2' -a "${rewrite}" != 'pathinfo' ] && echo "$(printf "%-30s" "Rewrite rule:")${CMSG}${web_install_dir}/conf/rewrite/${rewrite}.conf${CEND}"
   [ "${nginx_ssl_yn}" == 'y' ] && Print_ssl
 }