del opcache.save_comments

include/check_os.sh

@@ -10,13 +10,13 @@
 
 if [ -e "/usr/bin/yum" ]; then
   PM=yum
-  [ ! -e "$(which lsb_release 2>/dev/null)" ] && { yum -y install redhat-lsb-core; clear; }
+  command -v lsb_release >/dev/null 2>&1 || { yum -y install redhat-lsb-core; clear; }
 elif [ -e "/usr/bin/apt-get" ]; then
   PM=apt
-  [ ! -e "$(which lsb_release 2>/dev/null)" ] && { apt-get -y update; apt-get -y install lsb-release; clear; }
+  command -v lsb_release >/dev/null 2>&1 || { apt-get -y update; apt-get -y install lsb-release; clear; }
 fi
 
-[ ! -e "$(which lsb_release 2>/dev/null)" ] && { echo "${CFAILURE}${PM} source failed! ${CEND}"; kill -9 $$; }
+command -v lsb_release >/dev/null 2>&1 || { echo "${CFAILURE}${PM} source failed! ${CEND}"; kill -9 $$; }
 
 if [ -e /etc/redhat-release ]; then
   OS=CentOS

include/check_sw.sh

@@ -68,7 +68,7 @@ installDepsCentOS() {
   echo "${CMSG}Installing dependencies packages...${CEND}"
   yum check-update
   # Install needed packages
-  pkgList="deltarpm gcc gcc-c++ make cmake autoconf libjpeg libjpeg-devel libjpeg-turbo libjpeg-turbo-devel libpng libpng-devel freetype freetype-devel libxml2 libxml2-devel zlib zlib-devel glibc glibc-devel krb5-devel libc-client libc-client-devel glib2 glib2-devel bzip2 bzip2-devel ncurses ncurses-devel libaio numactl numactl-libs readline-devel curl curl-devel e2fsprogs e2fsprogs-devel krb5-devel libidn libidn-devel openssl openssl-devel libxslt-devel libicu-devel libevent-devel libtool libtool-ltdl bison gd-devel vim-enhanced pcre-devel zip unzip ntpdate sqlite-devel sysstat patch bc expect expat-devel rsync rsyslog git lsof lrzsz psmisc wget libatomic"
+  pkgList="deltarpm gcc gcc-c++ make cmake autoconf libjpeg libjpeg-devel libjpeg-turbo libjpeg-turbo-devel libpng libpng-devel freetype freetype-devel libxml2 libxml2-devel zlib zlib-devel glibc glibc-devel krb5-devel libc-client libc-client-devel glib2 glib2-devel bzip2 bzip2-devel ncurses ncurses-devel libaio numactl numactl-libs readline-devel curl curl-devel e2fsprogs e2fsprogs-devel krb5-devel libidn libidn-devel openssl openssl-devel libxslt-devel libicu-devel libevent-devel libtool libtool-ltdl bison gd-devel vim-enhanced pcre-devel zip unzip ntpdate sqlite-devel sysstat patch bc expect expat-devel rsync rsyslog git lsof lrzsz psmisc wget which libatomic"
   for Package in ${pkgList}; do
     yum -y install ${Package}
   done

include/jemalloc.sh

@@ -18,7 +18,7 @@ Install_Jemalloc() {
     unset LDFLAGS
     popd
     if [ -f "/usr/local/lib/libjemalloc.so" ]; then
-      if [ "${OS_BIT}" == '64' -a "$OS" == 'CentOS' ]; then
+      if [ "${OS_BIT}" == '64' -a "${OS}" == 'CentOS' ]; then
         ln -s /usr/local/lib/libjemalloc.so.2 /usr/lib64/libjemalloc.so.1
       else
         ln -s /usr/local/lib/libjemalloc.so.2 /usr/lib/libjemalloc.so.1

include/php-5.3.sh

@@ -54,7 +54,7 @@ Install_PHP53() {
   [ -z "`grep /usr/local/lib /etc/ld.so.conf.d/*.conf`" ] && echo '/usr/local/lib' > /etc/ld.so.conf.d/local.conf
   ldconfig
 
-  if [ "$OS" == 'CentOS' ]; then
+  if [ "${PM}" == 'yum' ]; then
     ln -s /usr/local/bin/libmcrypt-config /usr/bin/libmcrypt-config
     if [ "${OS_BIT}" == '64' ]; then
       ln -s /lib64/libpcre.so.0.0.1 /lib64/libpcre.so.1
@@ -146,8 +146,8 @@ Install_PHP53() {
     # php-fpm Init Script
     /bin/cp sapi/fpm/init.d.php-fpm /etc/init.d/php-fpm
     chmod +x /etc/init.d/php-fpm
-    [ "$OS" == 'CentOS' ] && { chkconfig --add php-fpm; chkconfig php-fpm on; }
-    [[ $OS =~ ^Ubuntu$|^Debian$ ]] && update-rc.d php-fpm defaults
+    [ "${PM}" == 'yum' ] && { chkconfig --add php-fpm; chkconfig php-fpm on; }
+    [ "${PM}" == 'apt' ] && update-rc.d php-fpm defaults
 
     cat > ${php_install_dir}/etc/php-fpm.conf <<EOF
 ;;;;;;;;;;;;;;;;;;;;;

include/php-5.4.sh

@@ -54,7 +54,7 @@ Install_PHP54() {
   [ -z "`grep /usr/local/lib /etc/ld.so.conf.d/*.conf`" ] && echo '/usr/local/lib' > /etc/ld.so.conf.d/local.conf
   ldconfig
 
-  if [ "$OS" == 'CentOS' ]; then
+  if [ "${PM}" == 'yum' ]; then
     ln -s /usr/local/bin/libmcrypt-config /usr/bin/libmcrypt-config
     if [ "${OS_BIT}" == '64' ]; then
       ln -s /lib64/libpcre.so.0.0.1 /lib64/libpcre.so.1
@@ -141,8 +141,8 @@ Install_PHP54() {
     # php-fpm Init Script
     /bin/cp sapi/fpm/init.d.php-fpm /etc/init.d/php-fpm
     chmod +x /etc/init.d/php-fpm
-    [ "$OS" == 'CentOS' ] && { chkconfig --add php-fpm; chkconfig php-fpm on; }
-    [[ $OS =~ ^Ubuntu$|^Debian$ ]] && update-rc.d php-fpm defaults
+    [ "${PM}" == 'yum' ] && { chkconfig --add php-fpm; chkconfig php-fpm on; }
+    [ "${PM}" == 'apt' ] && update-rc.d php-fpm defaults
 
     cat > ${php_install_dir}/etc/php-fpm.conf <<EOF
 ;;;;;;;;;;;;;;;;;;;;;

include/php-5.5.sh

@@ -54,7 +54,7 @@ Install_PHP55() {
   [ -z "`grep /usr/local/lib /etc/ld.so.conf.d/*.conf`" ] && echo '/usr/local/lib' > /etc/ld.so.conf.d/local.conf
   ldconfig
 
-  if [ "$OS" == 'CentOS' ]; then
+  if [ "${PM}" == 'yum' ]; then
     ln -s /usr/local/bin/libmcrypt-config /usr/bin/libmcrypt-config
     if [ "${OS_BIT}" == '64' ]; then
       ln -s /lib64/libpcre.so.0.0.1 /lib64/libpcre.so.1
@@ -144,7 +144,7 @@ opcache.memory_consumption=${Memory_limit}
 opcache.interned_strings_buffer=8
 opcache.max_accelerated_files=4000
 opcache.revalidate_freq=60
-opcache.save_comments=0
+;opcache.save_comments=0
 opcache.fast_shutdown=1
 opcache.enable_cli=1
 ;opcache.optimization_level=0
@@ -154,8 +154,8 @@ EOF
     # php-fpm Init Script
     /bin/cp sapi/fpm/init.d.php-fpm /etc/init.d/php-fpm
     chmod +x /etc/init.d/php-fpm
-    [ "$OS" == 'CentOS' ] && { chkconfig --add php-fpm; chkconfig php-fpm on; }
-    [[ $OS =~ ^Ubuntu$|^Debian$ ]] && update-rc.d php-fpm defaults
+    [ "${PM}" == 'yum' ] && { chkconfig --add php-fpm; chkconfig php-fpm on; }
+    [ "${PM}" == 'apt' ] && update-rc.d php-fpm defaults
 
     cat > ${php_install_dir}/etc/php-fpm.conf <<EOF
 ;;;;;;;;;;;;;;;;;;;;;

include/php-5.6.sh

@@ -54,7 +54,7 @@ Install_PHP56() {
   [ -z "`grep /usr/local/lib /etc/ld.so.conf.d/*.conf`" ] && echo '/usr/local/lib' > /etc/ld.so.conf.d/local.conf
   ldconfig
 
-  if [ "$OS" == 'CentOS' ]; then
+  if [ "${PM}" == 'yum' ]; then
     ln -s /usr/local/bin/libmcrypt-config /usr/bin/libmcrypt-config
     if [ "${OS_BIT}" == '64' ]; then
       ln -s /lib64/libpcre.so.0.0.1 /lib64/libpcre.so.1
@@ -147,7 +147,7 @@ opcache.memory_consumption=${Memory_limit}
 opcache.interned_strings_buffer=8
 opcache.max_accelerated_files=4000
 opcache.revalidate_freq=60
-opcache.save_comments=0
+;opcache.save_comments=0
 opcache.fast_shutdown=1
 opcache.enable_cli=1
 ;opcache.optimization_level=0
@@ -157,8 +157,8 @@ EOF
     # php-fpm Init Script
     /bin/cp sapi/fpm/init.d.php-fpm /etc/init.d/php-fpm
     chmod +x /etc/init.d/php-fpm
-    [ "$OS" == 'CentOS' ] && { chkconfig --add php-fpm; chkconfig php-fpm on; }
-    [[ $OS =~ ^Ubuntu$|^Debian$ ]] && update-rc.d php-fpm defaults
+    [ "${PM}" == 'yum' ] && { chkconfig --add php-fpm; chkconfig php-fpm on; }
+    [ "${PM}" == 'apt' ] && update-rc.d php-fpm defaults
 
     cat > ${php_install_dir}/etc/php-fpm.conf <<EOF
 ;;;;;;;;;;;;;;;;;;;;;

include/php-7.0.sh

@@ -54,7 +54,7 @@ Install_PHP70() {
   [ -z "`grep /usr/local/lib /etc/ld.so.conf.d/*.conf`" ] && echo '/usr/local/lib' > /etc/ld.so.conf.d/local.conf
   ldconfig
 
-  if [ "$OS" == 'CentOS' ]; then
+  if [ "${PM}" == 'yum' ]; then
     ln -s /usr/local/bin/libmcrypt-config /usr/bin/libmcrypt-config
     if [ "${OS_BIT}" == '64' ]; then
       ln -s /lib64/libpcre.so.0.0.1 /lib64/libpcre.so.1
@@ -153,7 +153,7 @@ opcache.max_wasted_percentage=5
 opcache.use_cwd=1
 opcache.validate_timestamps=1
 opcache.revalidate_freq=60
-opcache.save_comments=0
+;opcache.save_comments=0
 opcache.fast_shutdown=1
 opcache.consistency_checks=0
 ;opcache.optimization_level=0
@@ -163,8 +163,8 @@ EOF
     # php-fpm Init Script
     /bin/cp sapi/fpm/init.d.php-fpm /etc/init.d/php-fpm
     chmod +x /etc/init.d/php-fpm
-    [ "$OS" == 'CentOS' ] && { chkconfig --add php-fpm; chkconfig php-fpm on; }
-    [[ $OS =~ ^Ubuntu$|^Debian$ ]] && update-rc.d php-fpm defaults
+    [ "${PM}" == 'yum' ] && { chkconfig --add php-fpm; chkconfig php-fpm on; }
+    [ "${PM}" == 'apt' ] && update-rc.d php-fpm defaults
 
     cat > ${php_install_dir}/etc/php-fpm.conf <<EOF
 ;;;;;;;;;;;;;;;;;;;;;

include/php-7.1.sh

@@ -54,7 +54,7 @@ Install_PHP71() {
   [ -z "`grep /usr/local/lib /etc/ld.so.conf.d/*.conf`" ] && echo '/usr/local/lib' > /etc/ld.so.conf.d/local.conf
   ldconfig
 
-  if [ "$OS" == 'CentOS' ]; then
+  if [ "${PM}" == 'yum' ]; then
     ln -s /usr/local/bin/libmcrypt-config /usr/bin/libmcrypt-config
     if [ "${OS_BIT}" == '64' ]; then
       ln -s /lib64/libpcre.so.0.0.1 /lib64/libpcre.so.1
@@ -153,7 +153,7 @@ opcache.max_wasted_percentage=5
 opcache.use_cwd=1
 opcache.validate_timestamps=1
 opcache.revalidate_freq=60
-opcache.save_comments=0
+;opcache.save_comments=0
 opcache.fast_shutdown=1
 opcache.consistency_checks=0
 ;opcache.optimization_level=0
@@ -163,8 +163,8 @@ EOF
     # php-fpm Init Script
     /bin/cp sapi/fpm/init.d.php-fpm /etc/init.d/php-fpm
     chmod +x /etc/init.d/php-fpm
-    [ "$OS" == 'CentOS' ] && { chkconfig --add php-fpm; chkconfig php-fpm on; }
-    [[ $OS =~ ^Ubuntu$|^Debian$ ]] && update-rc.d php-fpm defaults
+    [ "${PM}" == 'yum' ] && { chkconfig --add php-fpm; chkconfig php-fpm on; }
+    [ "${PM}" == 'apt' ] && update-rc.d php-fpm defaults
 
     cat > ${php_install_dir}/etc/php-fpm.conf <<EOF
 ;;;;;;;;;;;;;;;;;;;;;

include/php-7.2.sh

@@ -58,7 +58,7 @@ Install_PHP72() {
   [ -z "`grep /usr/local/lib /etc/ld.so.conf.d/*.conf`" ] && echo '/usr/local/lib' > /etc/ld.so.conf.d/local.conf
   ldconfig
 
-  if [ "$OS" == 'CentOS' ]; then
+  if [ "${PM}" == 'yum' ]; then
     if [ "${OS_BIT}" == '64' ]; then
       ln -s /lib64/libpcre.so.0.0.1 /lib64/libpcre.so.1
       ln -s /usr/lib64/libc-client.so /usr/lib/libc-client.so
@@ -148,8 +148,7 @@ opcache.max_wasted_percentage=5
 opcache.use_cwd=1
 opcache.validate_timestamps=1
 opcache.revalidate_freq=60
-opcache.save_comments=0
-opcache.fast_shutdown=1
+;opcache.save_comments=0
 opcache.consistency_checks=0
 ;opcache.optimization_level=0
 EOF
@@ -158,8 +157,8 @@ EOF
     # php-fpm Init Script
     /bin/cp sapi/fpm/init.d.php-fpm /etc/init.d/php-fpm
     chmod +x /etc/init.d/php-fpm
-    [ "$OS" == 'CentOS' ] && { chkconfig --add php-fpm; chkconfig php-fpm on; }
-    [[ $OS =~ ^Ubuntu$|^Debian$ ]] && update-rc.d php-fpm defaults
+    [ "${PM}" == 'yum' ] && { chkconfig --add php-fpm; chkconfig php-fpm on; }
+    [ "${PM}" == 'apt' ] && update-rc.d php-fpm defaults
 
     cat > ${php_install_dir}/etc/php-fpm.conf <<EOF
 ;;;;;;;;;;;;;;;;;;;;;

include/zendopcache.sh

@@ -37,7 +37,7 @@ opcache.memory_consumption=${Memory_limit}
 opcache.interned_strings_buffer=8
 opcache.max_accelerated_files=4000
 opcache.revalidate_freq=60
-opcache.save_comments=0
+;opcache.save_comments=0
 opcache.fast_shutdown=1
 opcache.enable_cli=1
 ;opcache.optimization_level=0
@@ -56,7 +56,7 @@ opcache.max_wasted_percentage=5
 opcache.use_cwd=1
 opcache.validate_timestamps=1
 opcache.revalidate_freq=60
-opcache.save_comments=0
+;opcache.save_comments=0
 opcache.fast_shutdown=1
 opcache.consistency_checks=0
 ;opcache.optimization_level=0

tools/ckssh.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Author:  yeho <lj2007331 AT gmail.com>
 # Blog:  http://blog.linuxeye.cn
 

tools/mabs.sh

@@ -112,7 +112,7 @@ do
   while read IP PORT USER PASSWD PASSWD_2ND PASSWD_3RD PASSWD_4TH OTHERS
   # while read Line
   do
-    [ -z "`echo $IP | grep -E '^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}|CNS'`" ] && continue
+    #[ -z "`echo $IP | grep -E '^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}|CNS'`" ] && continue
     if [ "`python ./ckssh.py $IP $PORT`" == 'no' ]; then
       [ ! -e ipnologin.txt ] && > ipnologin.txt
       [ -z "`grep $IP ipnologin.txt | grep $(date +%F)`" ] && echo "`date +%F_%H%M` $IP" >> ipnologin.txt

versions.txt

@@ -25,7 +25,7 @@ mysql55_ver=5.5.61
 
 mariadb103_ver=10.3.8
 mariadb102_ver=10.2.16
-mariadb101_ver=10.1.34
+mariadb101_ver=10.1.35
 mariadb100_ver=10.0.36
 mariadb55_ver=5.5.61
 
@@ -35,9 +35,9 @@ percona55_ver=5.5.60-38.12
 
 alisql_ver=5.6.32-9
 
-pgsql_ver=10.4
+pgsql_ver=10.5
 
-mongodb_ver=4.0.0
+mongodb_ver=4.0.1
 
 # JDK
 jdk10_ver=10.0.2
@@ -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-8
+imagemagick_ver=6.9.10-9
 imagick_ver=3.4.3
 graphicsmagick_ver=1.3.28
 gmagick_for_php7_ver=2.0.5RC1
@@ -78,7 +78,7 @@ xdebug_ver=2.6.0
 pureftpd_ver=1.0.47
 
 # Redis
-redis_ver=4.0.10
+redis_ver=4.0.11
 redis_pecl_ver=4.1.1
 
 # Memcached
@@ -89,7 +89,7 @@ memcached_pecl_php7_ver=3.0.4
 memcache_pecl_ver=3.0.8
 
 # MongoDB
-mongodb_pecl_ver=1.5.1
+mongodb_pecl_ver=1.5.2
 mongo_pecl_ver=1.6.16
 
 # phpMyadmin