Browse Source

Update apps.conf

lj2007331 8 years ago
parent
commit
0088e06152

+ 10 - 10
apps.conf

@@ -18,13 +18,13 @@ mysql_5_7_version=5.7.12
 mysql_5_6_version=5.6.30
 mysql_5_5_version=5.5.49
 
-mariadb_10_1_version=10.1.13
+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_6_version=5.6.29-76.2
-percona_5_5_version=5.5.48-37.8
+percona_5_6_version=5.6.30-76.3
+percona_5_5_version=5.5.49-37.9
 
 # JDK
 jdk_6_version=1.6.0_45
@@ -34,15 +34,15 @@ jdk_8_version=1.8.0_92
 # PHP
 php_3_version=5.3.29
 php_4_version=5.4.45
-php_5_version=5.5.35
-php_6_version=5.6.21
-php_7_version=7.0.6
+php_5_version=5.5.36
+php_6_version=5.6.22
+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.3-10
-imagick_version=3.3.0
+ImageMagick_version=6.9.4-4
+imagick_version=3.4.1
 GraphicsMagick_version=1.3.23
 gmagick_version=1.1.7RC3
 libiconv_version=1.14
@@ -54,7 +54,7 @@ mhash_version=0.9.9.9
 pureftpd_version=1.0.42
 
 # Redis
-redis_version=3.0.7
+redis_version=3.2.0
 redis_pecl_version=2.2.7
 
 # Memcached
@@ -67,7 +67,7 @@ memcache_pecl_version=3.0.8
 phpMyAdmin_version=4.4.15.5
 
 # jemalloc
-jemalloc_version=4.1.0
+jemalloc_version=4.2.0
 
 # tcmalloc
 tcmalloc_version=2.5

+ 1 - 1
config/index_cn.html

@@ -28,7 +28,7 @@ font-family:微软雅黑,sans-serif;
 <p><b>创建FTP虚拟账号执行脚本:</b>&nbsp;&nbsp;<font color="#008000">./pureftpd_vhost.sh</font></p>
 <p><b>Github项目地址:</b>&nbsp;&nbsp;<a target="_blank" class="links" href="https://github.com/lj2007331/oneinstack">https://github.com/lj2007331/oneinstack</a></p>
 <p><b>OneinStack官网:</b>&nbsp;&nbsp;<a target="_blank" class="links" href="http://oneinstack.com">http://oneinstack.com</a></p>
-<p><b>QQ群:</b>&nbsp;&nbsp;213014293 486321919 438311066(满) 235258658(满)</p>
+<p><b>QQ群:</b>&nbsp;&nbsp;558540514(付费千人群) 556824757(新) 213014293(满) 486321919(满) 438311066(满) 235258658(满)</p>
 <p><b>赞助我们:</b></p>
 <p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;支付宝:&nbsp;&nbsp;lj2007331@gmail.com</p>
 <p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;PayPal:&nbsp;&nbsp;lj2007331@gmail.com</p>

+ 4 - 4
include/ImageMagick.sh

@@ -24,10 +24,10 @@ cd ..
 Install_php-imagick() {
 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
-        src_url=https://pecl.php.net/get/imagick-3.4.1.tgz && Download_src
-        tar xzf imagick-3.4.1.tgz
-        cd imagick-3.4.1
+    if [ "`$php_install_dir/bin/php -r 'echo PHP_VERSION;' | awk -F. '{print $1"."$2}'`" == '5.3' ];then
+        src_url=https://pecl.php.net/get/imagick-3.3.0.tgz && Download_src
+        tar xzf imagick-3.3.0.tgz
+        cd imagick-3.3.0
     else
         src_url=http://pecl.php.net/get/imagick-$imagick_version.tgz && Download_src
         tar xzf imagick-$imagick_version.tgz

+ 2 - 4
include/init_Debian.sh

@@ -20,7 +20,7 @@ apt-get -y update
 [ "$upgrade_yn" == 'y' ] && apt-get -y upgrade 
 
 # Install needed packages
-for Package in gcc g++ make cmake autoconf libjpeg8 libjpeg8-dev libjpeg-dev libpng12-0 libpng12-dev libpng3 libfreetype6 libfreetype6-dev libxml2 libxml2-dev zlib1g zlib1g-dev libc6 libc6-dev libglib2.0-0 libglib2.0-dev bzip2 libzip-dev libbz2-1.0 libncurses5 libncurses5-dev libaio1 libaio-dev libreadline-dev curl libcurl3 libcurl4-openssl-dev libcurl4-gnutls-dev e2fsprogs libkrb5-3 libkrb5-dev libltdl-dev libidn11 libidn11-dev openssl libssl-dev libtool libevent-dev bison re2c libsasl2-dev libxslt1-dev libicu-dev locales libcloog-ppl0 patch vim zip unzip tmux htop wget bc expect rsync git lsof lrzsz cron logrotate
+for Package in gcc g++ make cmake autoconf libjpeg8 libjpeg8-dev libjpeg-dev libpng12-0 libpng12-dev libpng3 libfreetype6 libfreetype6-dev libxml2 libxml2-dev zlib1g zlib1g-dev libc6 libc6-dev libglib2.0-0 libglib2.0-dev bzip2 libzip-dev libbz2-1.0 libncurses5 libncurses5-dev libaio1 libaio-dev libreadline-dev curl libcurl3 libcurl4-openssl-dev libcurl4-gnutls-dev e2fsprogs libkrb5-3 libkrb5-dev libltdl-dev libidn11 libidn11-dev openssl libssl-dev libtool libevent-dev bison re2c libsasl2-dev libxslt1-dev libicu-dev locales libcloog-ppl0 patch vim zip unzip tmux htop wget bc expect rsync git lsof lrzsz cron logrotate ntpdate
 do
     apt-get -y install $Package
 done
@@ -85,14 +85,12 @@ EOF
 sysctl -p
 
 sed -i 's@^ACTIVE_CONSOLES.*@ACTIVE_CONSOLES="/dev/tty[1-2]"@' /etc/default/console-setup 
-sed -i 's@^[3-6]:23:respawn@#&@g' /etc/inittab
-sed -i "s@^ctrlaltdel@#&@" /etc/inittab
 sed -i 's@^# en_US.UTF-8@en_US.UTF-8@' /etc/locale.gen
 init q
 
 # Update time
 ntpdate pool.ntp.org 
-[ -z "`grep 'ntpdate' /var/spool/cron/crontabs/root`" ] && { echo "*/20 * * * * `which ntpdate` pool.ntp.org > /dev/null 2>&1" >> /var/spool/cron/crontabs/root;chmod 600 /var/spool/cron/crontabs/root; }
+[ ! -e "/var/spool/cron/crontabs/root" -o -z "`grep ntpdate /var/spool/cron/crontabs/root 2>/dev/null`" ] && { echo "*/20 * * * * `which ntpdate` pool.ntp.org > /dev/null 2>&1" >> /var/spool/cron/crontabs/root;chmod 600 /var/spool/cron/crontabs/root; }
 service cron restart
 
 # iptables

+ 2 - 2
include/init_Ubuntu.sh

@@ -20,7 +20,7 @@ apt-get -y update
 [ "$upgrade_yn" == 'y' ] && apt-get -y upgrade 
 
 # Install needed packages
-for Package in gcc g++ make cmake autoconf libjpeg8 libjpeg8-dev libpng12-0 libpng12-dev libpng3 libfreetype6 libfreetype6-dev libxml2 libxml2-dev zlib1g zlib1g-dev libc6 libc6-dev libglib2.0-0 libglib2.0-dev bzip2 libzip-dev libbz2-1.0 libncurses5 libncurses5-dev libaio1 libaio-dev libreadline-dev curl libcurl3 libcurl4-openssl-dev e2fsprogs libkrb5-3 libkrb5-dev libltdl-dev libidn11 libidn11-dev openssl libssl-dev libtool libevent-dev re2c libsasl2-dev libxslt1-dev libicu-dev patch vim zip unzip tmux htop wget bc expect rsync git lsof lrzsz
+for Package in gcc g++ make cmake autoconf libjpeg8 libjpeg8-dev libpng12-0 libpng12-dev libpng3 libfreetype6 libfreetype6-dev libxml2 libxml2-dev zlib1g zlib1g-dev libc6 libc6-dev libglib2.0-0 libglib2.0-dev bzip2 libzip-dev libbz2-1.0 libncurses5 libncurses5-dev libaio1 libaio-dev libreadline-dev curl libcurl3 libcurl4-openssl-dev e2fsprogs libkrb5-3 libkrb5-dev libltdl-dev libidn11 libidn11-dev openssl libssl-dev libtool libevent-dev re2c libsasl2-dev libxslt1-dev libicu-dev patch vim zip unzip tmux htop wget bc expect rsync git lsof lrzsz ntpdate
 do
     apt-get -y install $Package
 done
@@ -110,7 +110,7 @@ sed -i 's@^@#@g' /etc/init/control-alt-delete.conf
 
 # Update time
 ntpdate pool.ntp.org 
-[ -z "`grep 'ntpdate' /var/spool/cron/crontabs/root`" ] && { echo "*/20 * * * * `which ntpdate` pool.ntp.org > /dev/null 2>&1" >> /var/spool/cron/crontabs/root;chmod 600 /var/spool/cron/crontabs/root; }
+[ ! -e "/var/spool/cron/crontabs/root" -o -z "`grep ntpdate /var/spool/cron/crontabs/root 2>/dev/null`" ] && { echo "*/20 * * * * `which ntpdate` pool.ntp.org > /dev/null 2>&1" >> /var/spool/cron/crontabs/root;chmod 600 /var/spool/cron/crontabs/root; }
 service cron restart
 
 # iptables

+ 16 - 25
include/mysql-5.5.sh

@@ -10,39 +10,28 @@
 
 Install_MySQL-5-5() {
 cd $oneinstack_dir/src
-src_url=http://cdn.mysql.com/Downloads/MySQL-5.5/mysql-$mysql_5_5_version.tar.gz && Download_src
+
+if [ "`../include/check_port.py aliyun-oss.linuxeye.com 80`" == 'True' ];then
+    DOWN_ADDR_MYSQL=http://aliyun-oss.linuxeye.com/mysql/MySQL-5.5
+else
+    [ "$IPADDR_STATE"x == "CN"x ] && DOWN_ADDR_MYSQL=http://mirrors.sohu.com/mysql/MySQL-5.5 || DOWN_ADDR_MYSQL=http://cdn.mysql.com/Downloads/MySQL-5.5
+fi
+
+src_url=$DOWN_ADDR_MYSQL/mysql-${mysql_5_5_version}-linux2.6-${SYS_BIT_b}.tar.gz && Download_src
 
 id -u mysql >/dev/null 2>&1
 [ $? -ne 0 ] && useradd -M -s /sbin/nologin mysql
 
+[ ! -d "$mysql_install_dir" ] && mkdir -p $mysql_install_dir
 mkdir -p $mysql_data_dir;chown mysql.mysql -R $mysql_data_dir
-tar zxf mysql-$mysql_5_5_version.tar.gz
-cd mysql-$mysql_5_5_version
+
+tar xzf mysql-${mysql_5_5_version}-linux2.6-${SYS_BIT_b}.tar.gz
+mv mysql-${mysql_5_5_version}-linux2.6-${SYS_BIT_b}/* $mysql_install_dir
 if [ "$je_tc_malloc" == '1' ];then
-    EXE_LINKER="-DCMAKE_EXE_LINKER_FLAGS='-ljemalloc'"
+    sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' $mysql_install_dir/bin/mysqld_safe
 elif [ "$je_tc_malloc" == '2' ];then
-    EXE_LINKER="-DCMAKE_EXE_LINKER_FLAGS='-ltcmalloc'"
+    sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libtcmalloc.so@' $mysql_install_dir/bin/mysqld_safe
 fi
-make clean
-[ ! -d "$mysql_install_dir" ] && mkdir -p $mysql_install_dir 
-cmake . -DCMAKE_INSTALL_PREFIX=$mysql_install_dir \
--DMYSQL_DATADIR=$mysql_data_dir \
--DSYSCONFDIR=/etc \
--DWITH_INNOBASE_STORAGE_ENGINE=1 \
--DWITH_PARTITION_STORAGE_ENGINE=1 \
--DWITH_FEDERATED_STORAGE_ENGINE=1 \
--DWITH_BLACKHOLE_STORAGE_ENGINE=1 \
--DWITH_MYISAM_STORAGE_ENGINE=1 \
--DWITH_ARCHIVE_STORAGE_ENGINE=1 \
--DWITH_READLINE=1 \
--DENABLED_LOCAL_INFILE=1 \
--DENABLE_DTRACE=0 \
--DDEFAULT_CHARSET=utf8mb4 \
--DDEFAULT_COLLATION=utf8mb4_general_ci \
--DWITH_EMBEDDED_SERVER=1 \
-$EXE_LINKER
-make -j `grep processor /proc/cpuinfo | wc -l` 
-make install
 
 if [ -d "$mysql_install_dir/support-files" ];then
     echo "${CSUCCESS}MySQL install successfully! ${CEND}"
@@ -55,6 +44,8 @@ else
 fi
 
 /bin/cp $mysql_install_dir/support-files/mysql.server /etc/init.d/mysqld
+sed -i "s@^basedir=.*@basedir=$mysql_install_dir@" /etc/init.d/mysqld
+sed -i "s@^datadir=.*@datadir=$mysql_data_dir@" /etc/init.d/mysqld
 chmod +x /etc/init.d/mysqld
 [ "$OS" == 'CentOS' ] && { chkconfig --add mysqld; chkconfig mysqld on; }
 [[ $OS =~ ^Ubuntu$|^Debian$ ]] && update-rc.d mysqld defaults

+ 2 - 0
include/mysql-5.6.sh

@@ -44,6 +44,8 @@ else
 fi
 
 /bin/cp $mysql_install_dir/support-files/mysql.server /etc/init.d/mysqld
+sed -i "s@^basedir=.*@basedir=$mysql_install_dir@" /etc/init.d/mysqld
+sed -i "s@^datadir=.*@datadir=$mysql_data_dir@" /etc/init.d/mysqld
 chmod +x /etc/init.d/mysqld
 [ "$OS" == 'CentOS' ] && { chkconfig --add mysqld; chkconfig mysqld on; }
 [[ $OS =~ ^Ubuntu$|^Debian$ ]] && update-rc.d mysqld defaults

+ 1 - 0
include/percona-5.7.sh

@@ -49,6 +49,7 @@ cmake . -DCMAKE_INSTALL_PREFIX=$percona_install_dir \
 -DWITH_MYISAM_STORAGE_ENGINE=1 \
 -DWITH_ARCHIVE_STORAGE_ENGINE=1 \
 -DENABLED_LOCAL_INFILE=1 \
+-DWITH_ZLIB=system \
 -DENABLE_DTRACE=0 \
 -DDEFAULT_CHARSET=utf8mb4 \
 -DDEFAULT_COLLATION=utf8mb4_general_ci \

+ 2 - 0
include/php-5.3.sh

@@ -16,6 +16,8 @@ src_url=http://downloads.sourceforge.net/project/mhash/mhash/$mhash_version/mhas
 src_url=http://downloads.sourceforge.net/project/mcrypt/MCrypt/$mcrypt_version/mcrypt-$mcrypt_version.tar.gz && Download_src
 src_url=http://mirrors.linuxeye.com/oneinstack/src/fpm-race-condition.patch && Download_src
 src_url=http://mirrors.linuxeye.com/oneinstack/src/debian_patches_disable_SSLv2_for_openssl_1_0_0.patch && Download_src
+src_url=http://mirrors.linuxeye.com/oneinstack/src/libiconv-glibc-2.16.patch && Download_src
+src_url=http://mirrors.linuxeye.com/oneinstack/src/php5.3patch && Download_src
 src_url=http://www.php.net/distributions/php-$php_3_version.tar.gz && Download_src
 
 tar xzf libiconv-$libiconv_version.tar.gz

+ 1 - 0
include/php-5.4.sh

@@ -15,6 +15,7 @@ src_url=http://downloads.sourceforge.net/project/mcrypt/Libmcrypt/$libmcrypt_ver
 src_url=http://downloads.sourceforge.net/project/mhash/mhash/$mhash_version/mhash-$mhash_version.tar.gz && Download_src
 src_url=http://downloads.sourceforge.net/project/mcrypt/MCrypt/$mcrypt_version/mcrypt-$mcrypt_version.tar.gz && Download_src
 src_url=http://mirrors.linuxeye.com/oneinstack/src/fpm-race-condition.patch && Download_src
+src_url=http://mirrors.linuxeye.com/oneinstack/src/libiconv-glibc-2.16.patch && Download_src
 src_url=http://www.php.net/distributions/php-$php_4_version.tar.gz && Download_src
 
 tar xzf libiconv-$libiconv_version.tar.gz

+ 1 - 0
include/php-5.5.sh

@@ -15,6 +15,7 @@ src_url=http://downloads.sourceforge.net/project/mcrypt/Libmcrypt/$libmcrypt_ver
 src_url=http://downloads.sourceforge.net/project/mhash/mhash/$mhash_version/mhash-$mhash_version.tar.gz && Download_src
 src_url=http://downloads.sourceforge.net/project/mcrypt/MCrypt/$mcrypt_version/mcrypt-$mcrypt_version.tar.gz && Download_src
 src_url=http://mirrors.linuxeye.com/oneinstack/src/fpm-race-condition.patch && Download_src
+src_url=http://mirrors.linuxeye.com/oneinstack/src/libiconv-glibc-2.16.patch && Download_src
 src_url=http://www.php.net/distributions/php-$php_5_version.tar.gz && Download_src
 
 tar xzf libiconv-$libiconv_version.tar.gz

+ 1 - 0
include/php-5.6.sh

@@ -14,6 +14,7 @@ src_url=http://ftp.gnu.org/pub/gnu/libiconv/libiconv-$libiconv_version.tar.gz &&
 src_url=http://downloads.sourceforge.net/project/mcrypt/Libmcrypt/$libmcrypt_version/libmcrypt-$libmcrypt_version.tar.gz && Download_src
 src_url=http://downloads.sourceforge.net/project/mhash/mhash/$mhash_version/mhash-$mhash_version.tar.gz && Download_src
 src_url=http://downloads.sourceforge.net/project/mcrypt/MCrypt/$mcrypt_version/mcrypt-$mcrypt_version.tar.gz && Download_src
+src_url=http://mirrors.linuxeye.com/oneinstack/src/libiconv-glibc-2.16.patch && Download_src
 src_url=http://www.php.net/distributions/php-$php_6_version.tar.gz && Download_src
 
 tar xzf libiconv-$libiconv_version.tar.gz

+ 1 - 0
include/php-7.sh

@@ -14,6 +14,7 @@ src_url=http://ftp.gnu.org/pub/gnu/libiconv/libiconv-$libiconv_version.tar.gz &&
 src_url=http://downloads.sourceforge.net/project/mcrypt/Libmcrypt/$libmcrypt_version/libmcrypt-$libmcrypt_version.tar.gz && Download_src
 src_url=http://downloads.sourceforge.net/project/mhash/mhash/$mhash_version/mhash-$mhash_version.tar.gz && Download_src
 src_url=http://downloads.sourceforge.net/project/mcrypt/MCrypt/$mcrypt_version/mcrypt-$mcrypt_version.tar.gz && Download_src
+src_url=http://mirrors.linuxeye.com/oneinstack/src/libiconv-glibc-2.16.patch && Download_src
 src_url=http://www.php.net/distributions/php-$php_7_version.tar.gz && Download_src
 
 tar xzf libiconv-$libiconv_version.tar.gz

+ 1 - 1
include/redis.sh

@@ -23,7 +23,7 @@ make
 
 if [ -f "src/redis-server" ];then
     mkdir -p $redis_install_dir/{bin,etc,var}
-    /bin/cp src/{redis-benchmark,redis-check-aof,redis-check-dump,redis-cli,redis-sentinel,redis-server} $redis_install_dir/bin/
+    /bin/cp src/{redis-benchmark,redis-check-aof,redis-check-rdb,redis-cli,redis-sentinel,redis-server} $redis_install_dir/bin/
     /bin/cp redis.conf $redis_install_dir/etc/
     ln -s $redis_install_dir/bin/* /usr/local/bin/
     sed -i 's@pidfile.*@pidfile /var/run/redis.pid@' $redis_install_dir/etc/redis.conf

+ 12 - 44
include/upgrade_db.sh

@@ -73,7 +73,7 @@ do
             DB_name=percona-server-$NEW_DB_version
             DB_URL=http://www.percona.com/redir/downloads/Percona-Server-`echo $NEW_DB_version | awk -F. '{print $1"."$2}'`/LATEST/source/tarball/$DB_name.tar.gz
         elif [ "$DB" == 'MySQL' ];then
-            [ `echo $NEW_DB_version | awk -F. '{print $1"."$2}'` != '5.5' ] && DB_name=mysql-${NEW_DB_version}-linux-glibc2.5-${SYS_BIT_b} || DB_name=mysql-$NEW_DB_version
+            [ `echo $NEW_DB_version | awk -F. '{print $1"."$2}'` != '5.5' ] && DB_name=mysql-${NEW_DB_version}-linux-glibc2.5-${SYS_BIT_b} || DB_name=mysql-${NEW_DB_version}-linux2.6-${SYS_BIT_b}
             DB_URL=$DOWN_ADDR/MySQL-`echo $NEW_DB_version | awk -F. '{print $1"."$2}'`/$DB_name.tar.gz
         fi
             [ ! -e "$DB_name.tar.gz" ] && wget --no-check-certificate -c $DB_URL > /dev/null 2>&1
@@ -171,49 +171,17 @@ $EXE_LINKER
         $percona_install_dir/bin/mysql -uroot -p${dbrootpwd} -e "reset master;" >/dev/null 2>&1
         [ $? -eq 0 ] &&  echo "You have ${CMSG}successfully${CEND} upgrade from ${CMSG}$OLD_DB_version${CEND} to ${CMSG}$NEW_DB_version${CEND}"
     elif [ "$DB" == 'MySQL' ];then
-        if [ "`echo $NEW_DB_version | awk -F. '{print $1"."$2}'`" == '5.5' ];then
-            tar zxf $DB_name.tar.gz
-            cd $DB_name
-            make clean
-            cmake . -DCMAKE_INSTALL_PREFIX=$mysql_install_dir \
--DMYSQL_DATADIR=$mysql_data_dir \
--DSYSCONFDIR=/etc \
--DWITH_INNOBASE_STORAGE_ENGINE=1 \
--DWITH_PARTITION_STORAGE_ENGINE=1 \
--DWITH_FEDERATED_STORAGE_ENGINE=1 \
--DWITH_BLACKHOLE_STORAGE_ENGINE=1 \
--DWITH_MYISAM_STORAGE_ENGINE=1 \
--DWITH_ARCHIVE_STORAGE_ENGINE=1 \
--DWITH_READLINE=1 \
--DENABLED_LOCAL_INFILE=1 \
--DENABLE_DTRACE=0 \
--DDEFAULT_CHARSET=utf8mb4 \
--DDEFAULT_COLLATION=utf8mb4_general_ci \
--DWITH_EMBEDDED_SERVER=1 \
-$EXE_LINKER
-
-            make -j `grep processor /proc/cpuinfo | wc -l`
-            service mysqld stop
-            mv ${mysql_install_dir}{,_old_`date +"%Y%m%d_%H%M%S"`}
-            mv ${mysql_data_dir}{,_old_`date +"%Y%m%d_%H%M%S"`}
-            [ ! -d "$mysql_install_dir" ] && mkdir -p $mysql_install_dir
-            mkdir -p $mysql_data_dir;chown mysql.mysql -R $mysql_data_dir
-            make install
-            cd ..
-            $mysql_install_dir/scripts/mysql_install_db --user=mysql --basedir=$mysql_install_dir --datadir=$mysql_data_dir
-        else
-            tar zxf $DB_name.tar.gz
-            service mysqld stop
-            mv ${mysql_install_dir}{,_old_`date +"%Y%m%d_%H%M%S"`}
-            mv ${mysql_data_dir}{,_old_`date +"%Y%m%d_%H%M%S"`}
-            [ ! -d "$mysql_install_dir" ] && mkdir -p $mysql_install_dir
-            mkdir -p $mysql_data_dir;chown mysql.mysql -R $mysql_data_dir
-            mv $DB_name/* $mysql_install_dir/
-            [ "$je_tc_malloc" == '1' ] && sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' $mysql_install_dir/bin/mysqld_safe
-            [ "$je_tc_malloc" == '2' ] && sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libtcmalloc.so@' $mysql_install_dir/bin/mysqld_safe
-            [ "`echo $NEW_DB_version | awk -F. '{print $1"."$2}'`" == '5.6' ] && $mysql_install_dir/scripts/mysql_install_db --user=mysql --basedir=$mysql_install_dir --datadir=$mysql_data_dir
-            [ "`echo $NEW_DB_version | awk -F. '{print $1"."$2}'`" == '5.7' ] && $mysql_install_dir/bin/mysqld --initialize-insecure --user=mysql --basedir=$mysql_install_dir --datadir=$mysql_data_dir
-        fi
+        tar zxf $DB_name.tar.gz
+        service mysqld stop
+        mv ${mysql_install_dir}{,_old_`date +"%Y%m%d_%H%M%S"`}
+        mv ${mysql_data_dir}{,_old_`date +"%Y%m%d_%H%M%S"`}
+        [ ! -d "$mysql_install_dir" ] && mkdir -p $mysql_install_dir
+        mkdir -p $mysql_data_dir;chown mysql.mysql -R $mysql_data_dir
+        mv $DB_name/* $mysql_install_dir/
+        [ "$je_tc_malloc" == '1' ] && sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' $mysql_install_dir/bin/mysqld_safe
+        [ "$je_tc_malloc" == '2' ] && sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libtcmalloc.so@' $mysql_install_dir/bin/mysqld_safe
+        [ "`echo $NEW_DB_version | awk -F. '{print $1"."$2}'`" != '5.7' ] && $mysql_install_dir/scripts/mysql_install_db --user=mysql --basedir=$mysql_install_dir --datadir=$mysql_data_dir
+        [ "`echo $NEW_DB_version | awk -F. '{print $1"."$2}'`" == '5.7' ] && $mysql_install_dir/bin/mysqld --initialize-insecure --user=mysql --basedir=$mysql_install_dir --datadir=$mysql_data_dir
 
         chown mysql.mysql -R $mysql_data_dir
         [ -e "$mysql_install_dir/my.cnf" ] && rm -rf $mysql_install_dir/my.cnf

+ 1 - 1
include/upgrade_redis.sh

@@ -47,7 +47,7 @@ if [ -e "redis-$NEW_Redis_version.tar.gz" ];then
     if [ -f "src/redis-server" ];then
         echo "Restarting Redis..."
         service redis-server stop
-        /bin/cp src/{redis-benchmark,redis-check-aof,redis-check-dump,redis-cli,redis-sentinel,redis-server} $redis_install_dir/bin/
+        /bin/cp src/{redis-benchmark,redis-check-aof,redis-check-rdb,redis-cli,redis-sentinel,redis-server} $redis_install_dir/bin/
         service redis-server start
         echo "You have ${CMSG}successfully${CEND} upgrade from ${CWARNING}$OLD_Redis_version${CEND} to ${CWARNING}$NEW_Redis_version${CEND}"
     else

+ 1 - 1
tools/db_bk.sh

@@ -32,7 +32,7 @@ fi
 if [ -e "$NewFile" ];then
     echo "[$NewFile] The Backup File is exists, Can't Backup" >> $LogFile
 else
-    $db_install_dir/bin/mysqldump -uroot -p$dbrootpwd --opt --databases $DBname > $DumpFile 
+    $db_install_dir/bin/mysqldump -uroot -p$dbrootpwd --databases $DBname > $DumpFile 
     cd $backup_dir
     tar czf $NewFile ${DumpFile##*/} >> $LogFile 2>&1
     echo "[$NewFile] Backup success ">> $LogFile

+ 2 - 2
vhost.sh

@@ -208,7 +208,7 @@ do
 done
 
 if [ -e "$web_install_dir/conf/vhost/$domain.conf" -o -e "$apache_install_dir/conf/vhost/$domain.conf" -o -e "$tomcat_install_dir/conf/vhost/$domain.xml" ]; then
-    [ -e "$web_install_dir/conf/vhost/$domain.conf" ] && echo -e "$domain in the Nginx/Tengine already exist! \nYou can delete ${CMSG}$web_install_dir/conf/vhost/$domain.conf${CEND} and re-create"
+    [ -e "$web_install_dir/conf/vhost/$domain.conf" ] && echo -e "$domain in the Nginx/Tengine/OpenResty already exist! \nYou can delete ${CMSG}$web_install_dir/conf/vhost/$domain.conf${CEND} and re-create"
     [ -e "$apache_install_dir/conf/vhost/$domain.conf" ] && echo -e "$domain in the Apache already exist! \nYou can delete ${CMSG}$apache_install_dir/conf/vhost/$domain.conf${CEND} and re-create"
     [ -e "$tomcat_install_dir/conf/vhost/$domain.xml" ] && echo -e "$domain in the Tomcat already exist! \nYou can delete ${CMSG}$tomcat_install_dir/conf/vhost/$domain.xml${CEND} and re-create"
     exit
@@ -361,7 +361,7 @@ Nginx_log() {
 while :
 do
     echo
-    read -p "Allow Nginx/Tengine access_log? [y/n]: " access_yn 
+    read -p "Allow Nginx/Tengine/OpenResty access_log? [y/n]: " access_yn 
     if [[ ! $access_yn =~ ^[y,n]$ ]];then
         echo "${CWARNING}input error! Please only input 'y' or 'n'${CEND}"
     else