lj2007331

apps.conf

@@ -13,8 +13,8 @@ mysql_6_version=5.6.25
 mysql_5_version=5.5.44
 mariadb_10_version=10.0.20
 mariadb_5_version=5.5.44
-percona_6_version=5.6.24-72.2
-percona_5_version=5.5.43-37.2
+percona_6_version=5.6.25-73.0
+percona_5_version=5.5.44-37.3
 
 # PHP
 php_3_version=5.3.29

functions/hhvm_CentOS.sh

@@ -164,28 +164,6 @@ memory_limit = 400000000
 post_max_size = 50000000
 EOF
 
-if [ "$CentOS_RHL" == '7' ];then
-cat > /etc/systemd/system/hhvm.service << EOF
-[Unit]
-Description=HHVM HipHop Virtual Machine (FCGI)
-
-[Service]
-ExecStartPre=/usr/bin/rm -rf /var/log/hhvm ; /usr/bin/mkdir /var/log/hhvm ; /usr/bin/chown ${run_user}.$run_user /var/log/hhvm 
-ExecStart=/usr/bin/hhvm --mode server --user $run_user --config /etc/hhvm/server.ini --config /etc/hhvm/php.ini --config /etc/hhvm/config.hdf
-
-[Install]
-WantedBy=multi-user.target
-EOF
-
-#systemctl enable hhvm
-#systemctl start hhvm
-elif [ "$CentOS_RHL" == '6' ];then
-/bin/cp ../init/hhvm-init-CentOS6 /etc/init.d/hhvm
-sed -i "s@^USER=www@USER=$run_user@" /etc/init.d/hhvm
-chmod +x /etc/init.d/hhvm
-#chkconfig hhvm on
-#service hhvm start
-fi
 if [ -e "/usr/bin/hhvm" -a ! -e "$php_install_dir" ];then
 	sed -i 's@/dev/shm/php-cgi.sock@/var/log/hhvm/sock@' $web_install_dir/conf/nginx.conf 
 	[ -z "`grep 'fastcgi_param SCRIPT_FILENAME' $web_install_dir/conf/nginx.conf`" ] && sed -i "s@fastcgi_index index.php;@&\n\t\tfastcgi_param SCRIPT_FILENAME \$document_root\$fastcgi_script_name;@" $web_install_dir/conf/nginx.conf 

functions/percona-5.5.sh

@@ -40,10 +40,6 @@ $EXE_LINKER
 make -j `grep processor /proc/cpuinfo | wc -l` 
 make install
 
-cd $percona_install_dir/lib/
-ln -s libperconaserverclient.so libmysqlclient.so
-cd -
-
 if [ -d "$percona_install_dir/bin" ];then
         echo -e "\033[32mPercona install successfully! \033[0m"
 else

functions/percona-5.6.sh

@@ -39,10 +39,6 @@ $EXE_LINKER
 make -j `grep processor /proc/cpuinfo | wc -l` 
 make install
 
-cd $percona_install_dir/lib/
-ln -s libperconaserverclient.so libmysqlclient.so
-cd -
-
 if [ -d "$percona_install_dir/bin" ];then
         echo -e "\033[32mPercona install successfully! \033[0m"
 else

init/hhvm-init-CentOS6

@@ -1,96 +0,0 @@
-#!/bin/sh
-#
-# hhvm        Starts The HHVM FastCGI Daemon
-#
-# chkconfig: - 85 15
-# description: Starts The HHVM FastCGI Daemon
-# processname: hhvm
-# config: /etc/hhvm/server.ini
-# config: /etc/sysconfig/hhvm
-# pidfile: /var/run/hhvm/hhvm.pid
-#
-### BEGIN INIT INFO
-# Provides: hhvm
-# Short-Description: start and stop the HHVM FastCGI Daemon
-# Description: Starts The HHVM FastCGI Daemon
-### END INIT INFO
-
-# Standard LSB functions
-#. /lib/lsb/init-functions
-
-# Source function library.
-. /etc/init.d/functions
-
-# Check that networking is up.
-. /etc/sysconfig/network
-
-if [ "$NETWORKING" = "no" ]
-then
-	exit 0
-fi
-
-RETVAL=0
-HHVM=/usr/bin/hhvm
-prog="hhvm"
-pidfile=${PIDFILE-/var/run/hhvm/pid}
-lockfile=${LOCKFILE-/var/run/hhvm/lock}
-
-CONFIG_HDF_FILE="/etc/hhvm/config.hdf"
-CONFIG_FILE="/etc/hhvm/server.ini"
-SYSTEM_CONFIG_FILE="/etc/hhvm/php.ini"
-MODE=server
-USER=www
-ARGS="--config ${CONFIG_FILE} --config ${SYSTEM_CONFIG_FILE} --config ${CONFIG_HDF_FILE}"
-
-if [ -f /etc/sysconfig/hhvm ]; then
-	. /etc/sysconfig/hhvm
-fi
-
-
-start() {
-	echo -n $"Starting $prog: "
-	dir=$(dirname ${pidfile})
-	[ -d $dir ] || { mkdir $dir; chown $USER:$USER $dir; }
-	daemon ${HHVM} --mode ${MODE} --user ${USER} ${ARGS}
-	RETVAL=$?
-	echo
-	[ $RETVAL -eq 0 ] && touch ${lockfile}
-}
-
-
-stop() {
-	echo -n $"Stopping $prog: "
-	killproc -p ${pidfile} ${HHVM}
-	RETVAL=$?
-	echo
-	if [ $RETVAL -eq 0 ] ; then
-		rm -f ${lockfile} ${pidfile}
-	fi
-}
-
-restart () {
-	stop
-	start
-}
-
-# See how we were called.
-case "$1" in
-  start)
-        start
-        ;;
-  stop)
-        stop
-        ;;
-  status)
-        status -p ${pidfile} ${HHVM}
-        RETVAL=$?
-        ;;
-  restart)
-	restart
-        ;;
-  *)
-        echo $"Usage: $prog {start|stop|status|restart}"
-        RETVAL=2
-esac
-
-exit $RETVAL

uninstall.sh

@@ -28,6 +28,7 @@ Uninstall()
 [ -e "$db_install_dir" ] && service mysqld stop && rm -rf /etc/init.d/mysqld /etc/my.cnf
 [ -e "$apache_install_dir" ] && service httpd stop && rm -rf /etc/init.d/httpd
 [ -e "$tomcat_install_dir" ] && service tomcat stop && rm -rf /etc/init.d/tomcat
+[ -e "/usr/java" ] && rm -rf /usr/java
 [ -e "$php_install_dir" ] && service php-fpm stop && rm -rf /etc/init.d/php-fpm
 [ -e "$web_install_dir" ] && service nginx stop && rm -rf /etc/init.d/nginx /etc/logrotate.d/nginx
 [ -e "$pureftpd_install_dir" ] && service pureftpd stop && rm -rf /etc/init.d/pureftpd
@@ -81,6 +82,7 @@ done
 [ -e "$web_install_dir" ] && echo -e "/etc/init.d/nginx\n/etc/logrotate.d/nginx"
 [ -e "$apache_install_dir" ] && echo '/etc/init.d/httpd'
 [ -e "$tomcat_install_dir" ] && echo '/etc/init.d/tomcat'
+[ -e "/usr/java" ] && echo '/usr/java' 
 [ -e "$db_install_dir" ] && echo -e "/etc/init.d/mysqld\n/etc/my.cnf"
 [ -e "$php_install_dir" ] && echo '/etc/init.d/php-fpm'
 [ -e "$pureftpd_install_dir" ] && echo '/etc/init.d/pureftpd'