Updated pecl_redis

apps.conf

@@ -2,7 +2,7 @@
 # Web
 nginx_version=1.10.1
 tengine_version=2.1.1
-openresty_version=1.9.7.5
+openresty_version=1.9.15.1
 
 tomcat_7_version=7.0.69
 tomcat_8_version=8.0.30
@@ -14,15 +14,15 @@ apr_version=1.5.2
 apr_util_version=1.5.4
 
 # DB
-mysql_5_7_version=5.7.12
-mysql_5_6_version=5.6.30
-mysql_5_5_version=5.5.49
+mysql_5_7_version=5.7.13
+mysql_5_6_version=5.6.31
+mysql_5_5_version=5.5.50
 
 mariadb_10_1_version=10.1.14
 mariadb_10_0_version=10.0.25
 mariadb_5_5_version=5.5.49
 
-percona_5_7_version=5.7.11-4
+percona_5_7_version=5.7.12-5
 percona_5_6_version=5.6.30-76.3
 percona_5_5_version=5.5.49-37.9
 
@@ -41,7 +41,7 @@ php_7_version=7.0.7
 zendopcache_version=7.0.5
 xcache_version=3.2.0
 apcu_version=4.0.10
-ImageMagick_version=6.9.4-5
+ImageMagick_version=6.9.4-8
 imagick_version=3.4.1
 GraphicsMagick_version=1.3.24
 gmagick_version=1.1.7RC3
@@ -55,7 +55,7 @@ pureftpd_version=1.0.42
 
 # Redis
 redis_version=3.2.0
-redis_pecl_version=2.2.7
+redis_pecl_version=2.2.8
 
 # Memcached
 memcached_version=1.4.25
@@ -67,7 +67,7 @@ memcache_pecl_version=3.0.8
 phpMyAdmin_version=4.4.15.6
 
 # jemalloc
-jemalloc_version=4.2.0
+jemalloc_version=4.2.1
 
 # tcmalloc
 tcmalloc_version=2.5

include/GraphicsMagick.sh

@@ -48,7 +48,7 @@ extension=gmagick.so
 EOF
         [ "$Apache_version" != '1' -a "$Apache_version" != '2' ] && service php-fpm restart || service httpd restart
     else
-        echo "${CFAILURE}PHP Gmagick module install failed, Please contact the author! ${CEND}"
+        echo "${CFAILURE}PHP gmagick module install failed, Please contact the author! ${CEND}"
     fi
 fi
 cd ..

include/ZendGuardLoader.sh

@@ -82,10 +82,10 @@ zend_loader.enable=1
 zend_loader.disable_licensing=0
 zend_loader.obfuscation_level_support=3
 EOF
-    echo "${CSUCCESS}ZendGuardLoader module install successfully! ${CEND}"
+    echo "${CSUCCESS}PHP ZendGuardLoader module install successfully! ${CEND}"
     [ "$Apache_version" != '1' -a "$Apache_version" != '2' ] && service php-fpm restart || service httpd restart
 else
-    echo "${CFAILURE}ZendGuardLoader module install failed, Please contact the author! ${CEND}"
+    echo "${CFAILURE}PHP ZendGuardLoader module install failed, Please contact the author! ${CEND}"
 fi
 cd ..
 }

include/redis.sh

@@ -54,11 +54,9 @@ Install_php-redis() {
 cd $oneinstack_dir/src
 if [ -e "$php_install_dir/bin/phpize" ];then
     if [ "`$php_install_dir/bin/php -r 'echo PHP_VERSION;' | awk -F. '{print $1}'`" == '7' ];then
-        #git clone -b php7 https://github.com/phpredis/phpredis.git
-        #cd phpredis
-        src_url=http://mirrors.linuxeye.com/oneinstack/src/phpredis-php7.tgz && Download_src
-        tar xzf phpredis-php7.tgz
-        cd phpredis-php7
+        src_url=http://pecl.php.net/get/redis-3.0.0.tgz && Download_src
+        tar xzf redis-3.0.0.tgz
+        cd redis-3.0.0
     else
         src_url=http://pecl.php.net/get/redis-$redis_pecl_version.tgz && Download_src
         tar xzf redis-$redis_pecl_version.tgz

include/upgrade_db.sh

@@ -10,7 +10,7 @@
 
 Upgrade_DB() {
 cd $oneinstack_dir/src
-[ ! -e "$db_install_dir/bin/mysql" ] && echo "${CWARNING}The MySQL/MariaDB/Percona is not installed on your system! ${CEND}" && exit 1
+[ ! -e "$db_install_dir/bin/mysql" ] && echo "${CWARNING}MySQL/MariaDB/Percona is not installed on your system! ${CEND}" && exit 1
 OLD_DB_version_tmp=`$db_install_dir/bin/mysql -V | awk '{print $5}' | awk -F, '{print $1}'`
 DB_tmp=`echo $OLD_DB_version_tmp | awk -F'-' '{print $2}'`
 if [ "$DB_tmp" == 'MariaDB' ];then

include/upgrade_php.sh

@@ -10,7 +10,7 @@
 
 Upgrade_PHP() {
 cd $oneinstack_dir/src
-[ ! -e "$php_install_dir" ] && echo "${CWARNING}The PHP is not installed on your system! ${CEND}" && exit 1
+[ ! -e "$php_install_dir" ] && echo "${CWARNING}PHP is not installed on your system! ${CEND}" && exit 1
 echo
 OLD_PHP_version=`$php_install_dir/bin/php -r 'echo PHP_VERSION;'`
 echo "Current PHP Version: ${CMSG}$OLD_PHP_version${CEND}"

include/upgrade_phpmyadmin.sh

@@ -10,7 +10,7 @@
 
 Upgrade_phpMyAdmin() {
 cd $oneinstack_dir/src
-[ ! -e "$wwwroot_dir/default/phpMyAdmin" ] && echo "${CWARNING}The phpMyAdmin is not installed on your system! ${CEND}" && exit 1
+[ ! -e "$wwwroot_dir/default/phpMyAdmin" ] && echo "${CWARNING}phpMyAdmin is not installed on your system! ${CEND}" && exit 1
 OLD_phpMyAdmin_version=`grep Version $wwwroot_dir/default/phpMyAdmin/README | awk '{print $2}'`
 echo "Current phpMyAdmin Version: ${CMSG}$OLD_phpMyAdmin_version${CEND}"
 
@@ -25,7 +25,7 @@ while :; do echo
             echo "${CWARNING}phpMyAdmin version does not exist! ${CEND}"
         fi
     else
-        echo "${CWARNING}input error! The upgrade phpMyAdmin version is the same as the old version${CEND}"
+        echo "${CWARNING}input error! Upgrade phpMyAdmin version is the same as the old version${CEND}"
     fi
 done
 

include/upgrade_redis.sh

@@ -10,7 +10,7 @@
 
 Upgrade_Redis() {
 cd $oneinstack_dir/src
-[ ! -d "$redis_install_dir" ] && echo "${CWARNING}The Redis is not installed on your system! ${CEND}" && exit 1
+[ ! -d "$redis_install_dir" ] && echo "${CWARNING}Redis is not installed on your system! ${CEND}" && exit 1
 OLD_Redis_version=`$redis_install_dir/bin/redis-cli --version | awk '{print $2}'`
 echo "Current Redis Version: ${CMSG}$OLD_Redis_version${CEND}"
 while :; do echo
@@ -24,7 +24,7 @@ while :; do echo
             echo "${CWARNING}Redis version does not exist! ${CEND}"
         fi
     else
-        echo "${CWARNING}input error! The upgrade Redis version is the same as the old version${CEND}"
+        echo "${CWARNING}input error! Upgrade Redis version is the same as the old version${CEND}"
     fi
 done
 

include/upgrade_web.sh

@@ -10,7 +10,7 @@
 
 Upgrade_Nginx() {
 cd $oneinstack_dir/src
-[ ! -e "$nginx_install_dir/sbin/nginx" ] && echo "${CWARNING}The Nginx is not installed on your system! ${CEND}" && exit 1
+[ ! -e "$nginx_install_dir/sbin/nginx" ] && echo "${CWARNING}Nginx is not installed on your system! ${CEND}" && exit 1
 OLD_Nginx_version_tmp=`$nginx_install_dir/sbin/nginx -v 2>&1`
 OLD_Nginx_version=${OLD_Nginx_version_tmp##*/}
 echo
@@ -28,7 +28,7 @@ while :; do echo
             echo "${CWARNING}Nginx version does not exist! ${CEND}"
         fi
     else
-        echo "${CWARNING}input error! The upgrade Nginx version is the same as the old version${CEND}"
+        echo "${CWARNING}input error! Upgrade Nginx version is the same as the old version${CEND}"
     fi
 done
 
@@ -62,7 +62,7 @@ cd ..
 
 Upgrade_Tengine() {
 cd $oneinstack_dir/src
-[ ! -e "$tengine_install_dir/sbin/nginx" ] && echo "${CWARNING}The Tengine is not installed on your system! ${CEND}" && exit 1
+[ ! -e "$tengine_install_dir/sbin/nginx" ] && echo "${CWARNING}Tengine is not installed on your system! ${CEND}" && exit 1
 OLD_Tengine_version_tmp=`$tengine_install_dir/sbin/nginx -v 2>&1`
 OLD_Tengine_version="`echo ${OLD_Tengine_version_tmp#*/} | awk '{print $1}'`"
 echo
@@ -80,7 +80,7 @@ while :; do echo
             echo "${CWARNING}Tengine version does not exist! ${CEND}"
         fi
     else
-        echo "${CWARNING}input error! The upgrade Tengine version is the same as the old version${CEND}"
+        echo "${CWARNING}input error! Upgrade Tengine version is the same as the old version${CEND}"
     fi
 done
 
@@ -119,7 +119,7 @@ cd ..
 
 Upgrade_OpenResty() {
 cd $oneinstack_dir/src
-[ ! -e "$openresty_install_dir/nginx/sbin/nginx" ] && echo "${CWARNING}The OpenResty is not installed on your system! ${CEND}" && exit 1
+[ ! -e "$openresty_install_dir/nginx/sbin/nginx" ] && echo "${CWARNING}OpenResty is not installed on your system! ${CEND}" && exit 1
 OLD_OpenResty_version_tmp=`$openresty_install_dir/nginx/sbin/nginx -v 2>&1`
 OLD_OpenResty_version="`echo ${OLD_OpenResty_version_tmp#*/} | awk '{print $1}'`"
 echo
@@ -137,7 +137,7 @@ while :; do echo
             echo "${CWARNING}OpenResty version does not exist! ${CEND}"
         fi
     else
-        echo "${CWARNING}input error! The upgrade OpenResty version is the same as the old version${CEND}"
+        echo "${CWARNING}input error! Upgrade OpenResty version is the same as the old version${CEND}"
     fi
 done
 

include/zendopcache.sh

@@ -33,12 +33,12 @@ opcache.fast_shutdown=1
 opcache.enable_cli=1
 ;opcache.optimization_level=0
 EOF
-    echo "${CSUCCESS}Zend OPcache module install successfully! ${CEND}"
+    echo "${CSUCCESS}PHP OPcache module install successfully! ${CEND}"
     cd ..
     rm -rf zendopcache-$zendopcache_version
     [ "$Apache_version" != '1' -a "$Apache_version" != '2' ] && service php-fpm restart || service httpd restart
 else
-    echo "${CFAILURE}Zend OPcache module install failed, Please contact the author! ${CEND}"
+    echo "${CFAILURE}PHP OPcache module install failed, Please contact the author! ${CEND}"
 fi
 cd ..
 }

pureftpd_vhost.sh

@@ -24,7 +24,7 @@ printf "
 # Check if user is root
 [ $(id -u) != "0" ] && { echo "${CFAILURE}Error: You must be root to run this script${CEND}"; exit 1; }
 
-[ ! -d "$pureftpd_install_dir" ] && { echo "${CFAILURE}The ftp server does not exist! ${CEND}"; exit 1; }
+[ ! -d "$pureftpd_install_dir" ] && { echo "${CFAILURE}FTP server does not exist! ${CEND}"; exit 1; }
 
 FTP_conf=$pureftpd_install_dir/etc/pure-ftpd.conf
 FTP_tmp_passfile=$pureftpd_install_dir/etc/pureftpd_psss.tmp

reset_db_root_password.sh

@@ -27,7 +27,7 @@ printf "
 
 Reset_db_root_password()
 {
-[ ! -d "$db_install_dir" ] && { echo "${CFAILURE}The Database is not installed on your system! ${CEND}"; exit 1; }
+[ ! -d "$db_install_dir" ] && { echo "${CFAILURE}Database is not installed on your system! ${CEND}"; exit 1; }
 while :; do echo
     read -p "Please input the root password of database: " New_dbrootpwd
     [ -n "`echo $New_dbrootpwd | grep '[+|&]'`" ] && { echo "${CWARNING}input error,not contain a plus sign (+) and &${CEND}"; continue; }