Update include/mysql-5.*.sh

include/apache-2.2.sh

@@ -129,6 +129,7 @@ RemoteIPInternalProxy 127.0.0.1
 EOF
     sed -i "s@Include conf/extra/httpd-mpm.conf@Include conf/extra/httpd-mpm.conf\nInclude conf/extra/httpd-remoteip.conf@" $apache_install_dir/conf/httpd.conf
 fi
+ldconfig
 service httpd start
 cd ..
 }

include/apache-2.4.sh

@@ -144,6 +144,7 @@ EOF
     sed -i "s@Include conf/extra/httpd-mpm.conf@Include conf/extra/httpd-mpm.conf\nInclude conf/extra/httpd-remoteip.conf@" $apache_install_dir/conf/httpd.conf
     sed -i "s@LogFormat \"%h %l@LogFormat \"%h %a %l@g" $apache_install_dir/conf/httpd.conf
 fi
+ldconfig
 service httpd start
 cd ..
 }

include/init_CentOS.sh

@@ -53,10 +53,6 @@ for Service in sshd network crond iptables messagebus irqbalance syslog rsyslog
 setenforce 0
 sed -i 's/^SELINUX=.*$/SELINUX=disabled/' /etc/selinux/config
 
-# initdefault
-sed -i 's/^id:.*$/id:3:initdefault:/' /etc/inittab
-init q
-
 # PS1
 [ -z "`grep ^PS1 ~/.bashrc`" ] && echo 'PS1="\[\e[37;40m\][\[\e[32;40m\]\u\[\e[37;40m\]@\h \[\e[35;40m\]\W\[\e[0m\]]\\$ "' >> ~/.bashrc
 

include/mysql-5.5.sh

@@ -32,7 +32,7 @@ else
 fi
 
 FILE_NAME=mysql-${mysql_5_5_version}-linux2.6-${SYS_BIT_b}.tar.gz
-src_url=$DOWN_ADDR_MYSQL/$FILE_NAME && Download_src
+wget --tries=6 -c --no-check-certificate $DOWN_ADDR_MYSQL/$FILE_NAME
 src_url=$DOWN_ADDR_MYSQL/$FILE_NAME.md5 && Download_src
 MYSQL_TAR_MD5=`awk '{print $1}' $FILE_NAME.md5`
 while [ "`md5sum $FILE_NAME | awk '{print $1}'`" != "$MYSQL_TAR_MD5" ];

include/mysql-5.6.sh

@@ -32,7 +32,7 @@ else
 fi
 
 FILE_NAME=mysql-${mysql_5_6_version}-linux-glibc2.5-${SYS_BIT_b}.tar.gz
-src_url=$DOWN_ADDR_MYSQL/$FILE_NAME && Download_src
+wget --tries=6 -c --no-check-certificate $DOWN_ADDR_MYSQL/$FILE_NAME
 src_url=$DOWN_ADDR_MYSQL/$FILE_NAME.md5 && Download_src
 MYSQL_TAR_MD5=`awk '{print $1}' $FILE_NAME.md5`
 while [ "`md5sum $FILE_NAME | awk '{print $1}'`" != "$MYSQL_TAR_MD5" ];

include/mysql-5.7.sh

@@ -32,7 +32,7 @@ else
 fi
 
 FILE_NAME=mysql-${mysql_5_7_version}-linux-glibc2.5-${SYS_BIT_b}.tar.gz
-src_url=$DOWN_ADDR_MYSQL/$FILE_NAME && Download_src
+wget --tries=6 -c --no-check-certificate $DOWN_ADDR_MYSQL/$FILE_NAME
 src_url=$DOWN_ADDR_MYSQL/$FILE_NAME.md5 && Download_src
 MYSQL_TAR_MD5=`awk '{print $1}' $FILE_NAME.md5`
 while [ "`md5sum $FILE_NAME | awk '{print $1}'`" != "$MYSQL_TAR_MD5" ];

include/upgrade_db.sh

@@ -21,7 +21,7 @@ elif [ -n "$DB_tmp" -a "$DB_tmp" != 'MariaDB' ];then
     DB=Percona
     OLD_DB_version=$OLD_DB_version_tmp
 else
-    [ "$IPADDR_COUNTRY"x == "CN"x ] && DOWN_ADDR=http://mirrors.sohu.com/mysql || DOWN_ADDR=http://cdn.mysql.com/Downloads
+    [ "$IPADDR_COUNTRY"x == "CN"x ] && DOWN_ADDR=https://mirrors.tuna.tsinghua.edu.cn/mysql/downloads || DOWN_ADDR=http://cdn.mysql.com/Downloads
     DB=MySQL
     OLD_DB_version=$OLD_DB_version_tmp
 fi

uninstall.sh

@@ -74,6 +74,7 @@ Print_web() {
 [ -e "/etc/init.d/tomcat" ] && echo "/etc/init.d/tomcat"
 [ -e "/etc/logrotate.d/tomcat" ] && echo "/etc/logrotate.d/tomcat"
 [ -d "/usr/java" ] && echo '/usr/java'
+[ -d "/usr/local/apr" ] && echo '/usr/local/apr'
 }
 
 Uninstall_Web() {
@@ -81,7 +82,7 @@ Uninstall_Web() {
 [ -d "$tengine_install_dir" ] && { killall nginx > /dev/null 2>&1; rm -rf $tengine_install_dir /etc/init.d/nginx /etc/logrotate.d/nginx; sed -i "s@$tengine_install_dir/sbin:@@" /etc/profile; }
 [ -d "$openresty_install_dir" ] && { killall nginx > /dev/null 2>&1; rm -rf $openresty_install_dir /etc/init.d/nginx /etc/logrotate.d/nginx; sed -i "s@$openresty_install_dir/nginx/sbin:@@" /etc/profile; }
 [ -d "$apache_install_dir" ] && { service httpd stop > /dev/null 2>&1; rm -rf $apache_install_dir /etc/init.d/httpd /etc/logrotate.d/apache; sed -i "s@$apache_install_dir/bin:@@" /etc/profile; }
-[ -d "$tomcat_install_dir" ] && { killall java > /dev/null 2>&1; chmod +x /etc/logrotate.d/tomcat; rm -rf $tomcat_install_dir /etc/init.d/tomcat; /etc/logrotate.d/tomcat; }
+[ -d "$tomcat_install_dir" ] && { killall java > /dev/null 2>&1; chmod +x /etc/logrotate.d/tomcat; rm -rf $tomcat_install_dir /etc/init.d/tomcat /etc/logrotate.d/tomcat /usr/local/apr; }
 [ -d "/usr/java" ] && { rm -rf /usr/java; sed -i '/export JAVA_HOME=/d' /etc/profile; sed -i '/export CLASSPATH=/d' /etc/profile; sed -i 's@\$JAVA_HOME/bin:@@' /etc/profile; }
 [ -e "$wwwroot_dir" ] && /bin/mv ${wwwroot_dir}{,$(date +%Y%m%d%H)}
 sed -i 's@^website_name=.*@website_name=@' ./options.conf

versions.txt

@@ -16,11 +16,11 @@ apr_version=1.5.2
 apr_util_version=1.5.4
 
 # DB
-mysql_5_7_version=5.7.14
-mysql_5_6_version=5.6.32
-mysql_5_5_version=5.5.51
+mysql_5_7_version=5.7.15
+mysql_5_6_version=5.6.33
+mysql_5_5_version=5.5.52
 
-mariadb_10_1_version=10.1.16
+mariadb_10_1_version=10.1.17
 mariadb_10_0_version=10.0.27
 mariadb_5_5_version=5.5.51
 
@@ -43,7 +43,7 @@ php_3_version=5.3.29
 zendopcache_version=7.0.5
 xcache_version=3.2.0
 apcu_version=4.0.10
-ImageMagick_version=6.9.5-7
+ImageMagick_version=6.9.5-9
 imagick_version=3.4.1
 GraphicsMagick_version=1.3.24
 gmagick_version=1.1.7RC3