Update apps.conf

apps.conf

@@ -19,7 +19,7 @@ mysql_5_version=5.5.45
 mariadb_10_version=10.0.21
 mariadb_5_version=5.5.45
 
-percona_6_version=5.6.26-74.0
+percona_6_version=5.6.25-73.1
 percona_5_version=5.5.45-37.4
 
 # JDK
@@ -60,7 +60,7 @@ memcached_pecl_version=2.2.0
 memcache_pecl_version=2.2.7
 
 # phpMyadmin
-phpMyAdmin_version=4.4.14.1
+phpMyAdmin_version=4.4.15
 
 # jemalloc
 jemalloc_version=4.0.1

include/percona-5.5.sh

@@ -11,8 +11,7 @@
 Install_Percona-5-5()
 {
 cd $oneinstack_dir/src
-
-src_url=http://www.percona.com/redir/downloads/Percona-Server-5.5/LATEST/source/tarball/percona-server-$percona_5_version.tar.gz && Download_src
+src_url=https://www.percona.com/downloads/Percona-Server-5.5/Percona-Server-$percona_5_version/source/tarball/percona-server-$percona_5_version.tar.gz && Download_src
 
 id -u mysql >/dev/null 2>&1
 [ $? -ne 0 ] && useradd -M -s /sbin/nologin mysql

include/percona-5.6.sh

@@ -11,7 +11,7 @@
 Install_Percona-5-6()
 {
 cd $oneinstack_dir/src
-src_url=http://www.percona.com/redir/downloads/Percona-Server-5.6/LATEST/source/tarball/percona-server-$percona_6_version.tar.gz && Download_src
+src_url=https://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-$percona_6_version/source/tarball/percona-server-$percona_6_version.tar.gz && Download_src
 
 id -u mysql >/dev/null 2>&1
 [ $? -ne 0 ] && useradd -M -s /sbin/nologin mysql

include/tomcat-7.sh

@@ -48,10 +48,10 @@ if [ -e "$tomcat_install_dir/conf/server.xml" ];then
         cat > $tomcat_install_dir/bin/setenv.sh << EOF
 JAVA_OPTS='-server -Xms${Xms_Mem}m -Xmx`expr $Mem / 2`m'
 CATALINA_OPTS="-Djava.library.path=/usr/local/apr/lib"
-#  -Djava.rmi.server.hostname=$IPADDR
-#  -Dcom.sun.management.jmxremote.password.file=\$CATALINA_BASE/conf/jmxremote.password
+# -Djava.rmi.server.hostname=$IPADDR
+# -Dcom.sun.management.jmxremote.password.file=\$CATALINA_BASE/conf/jmxremote.password
 # -Dcom.sun.management.jmxremote.access.file=\$CATALINA_BASE/conf/jmxremote.access
-#  -Dcom.sun.management.jmxremote.ssl=false"
+# -Dcom.sun.management.jmxremote.ssl=false"
 EOF
         cd ../../../;rm -rf tomcat-native-*
         chmod +x $tomcat_install_dir/bin/*.sh

include/tomcat-8.sh

@@ -48,10 +48,10 @@ if [ -e "$tomcat_install_dir/conf/server.xml" ];then
         cat > $tomcat_install_dir/bin/setenv.sh << EOF
 JAVA_OPTS='-server -Xms${Xms_Mem}m -Xmx`expr $Mem / 2`m'
 CATALINA_OPTS="-Djava.library.path=/usr/local/apr/lib"
-#  -Djava.rmi.server.hostname=$IPADDR
-#  -Dcom.sun.management.jmxremote.password.file=\$CATALINA_BASE/conf/jmxremote.password
+# -Djava.rmi.server.hostname=$IPADDR
+# -Dcom.sun.management.jmxremote.password.file=\$CATALINA_BASE/conf/jmxremote.password
 # -Dcom.sun.management.jmxremote.access.file=\$CATALINA_BASE/conf/jmxremote.access
-#  -Dcom.sun.management.jmxremote.ssl=false"
+# -Dcom.sun.management.jmxremote.ssl=false"
 EOF
         cd ../../../;rm -rf tomcat-native-*
         chmod +x $tomcat_install_dir/bin/*.sh

vhost.sh

@@ -673,7 +673,7 @@ Del_Apache_Vhost() {
 }
 
 Del_Tomcat_Vhost() {
-    if [ -n "`grep ${domain}-vhost $tomcat_install_dir/conf/server.xml`" ];then
+    if [ -e "$tomcat_install_dir/conf/server.xml" ] && [ -n "`grep ${domain}-vhost $tomcat_install_dir/conf/server.xml`" ];then
         sed -i /${domain}-vhost/d $tomcat_install_dir/conf/server.xml 
         rm -rf $tomcat_install_dir/conf/vhost/${domain}.xml
         /etc/init.d/tomcat restart