Fix del openssl for jcloud

include/percona-5.5.sh

@@ -22,7 +22,7 @@ Install_Percona55() {
     tar xvf Percona-Server-${perconaVerStr1}-Linux.${SYS_BIT_b}.${sslLibVer}.tar.gz
     mv Percona-Server-${perconaVerStr1}-Linux.${SYS_BIT_b}.${sslLibVer}/* ${percona_install_dir}
     sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' ${percona_install_dir}/bin/mysqld_safe
-    sed -i "s@/usr/local/Percona-Server-${percona55_version}-Linux.${SYS_BIT_b}.${sslLibVer}@${percona_install_dir}@g" ${percona_install_dir}/bin/mysqld_safe 
+    sed -i "s@/usr/local/Percona-Server-${perconaVerStr1}-Linux.${SYS_BIT_b}.${sslLibVer}@${percona_install_dir}@g" ${percona_install_dir}/bin/mysqld_safe 
   elif [ "${dbInstallMethods}" == "2" ]; then
     tar xvf percona-server-${percona55_version}.tar.gz
     pushd percona-server-${percona55_version}

include/percona-5.6.sh

@@ -22,7 +22,7 @@ Install_Percona56() {
     tar xvf Percona-Server-${perconaVerStr1}-Linux.${SYS_BIT_b}.${sslLibVer}.tar.gz
     mv Percona-Server-${perconaVerStr1}-Linux.${SYS_BIT_b}.${sslLibVer}/* ${percona_install_dir}
     sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' ${percona_install_dir}/bin/mysqld_safe
-    sed -i "s@/usr/local/Percona-Server-${percona56_version}-Linux.${SYS_BIT_b}.${sslLibVer}@${percona_install_dir}@g" ${percona_install_dir}/bin/mysqld_safe 
+    sed -i "s@/usr/local/Percona-Server-${perconaVerStr1}-Linux.${SYS_BIT_b}.${sslLibVer}@${percona_install_dir}@g" ${percona_install_dir}/bin/mysqld_safe 
   elif [ "${dbInstallMethods}" == "2" ]; then
     tar xvf percona-server-${percona56_version}.tar.gz
     pushd percona-server-${percona56_version}

init.d/Nginx-init-Ubuntu

@@ -1,334 +1,62 @@
 #! /bin/sh
+ 
 ### BEGIN INIT INFO
 # Provides:          nginx
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
+# Required-Start:    $all
+# Required-Stop:     $all
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
-# Short-Description: nginx init.d dash script for Ubuntu <=9.10.
-# Description:       nginx init.d dash script for Ubuntu <=9.10.
+# Short-Description: starts the nginx web server
+# Description:       starts nginx using start-stop-daemon
 ### END INIT INFO
-#------------------------------------------------------------------------------
-# nginx - this Debian Almquist shell (dash) script, starts and stops the nginx
-#         daemon for ubuntu 9.10 and lesser version numbered releases.
-#
-# description:  Nginx is an HTTP(S) server, HTTP(S) reverse \
-#               proxy and IMAP/POP3 proxy server.  This \
-#       script will manage the initiation of the \
-#       server and it's process state.
-#
-# processname: nginx
-# config:      /usr/local/nginx/conf/nginx.conf
-# pidfile:     /var/run/nginx.pid
-# Provides:    nginx
-#
-# Author:  Jason Giedymin
-#          <jason.giedymin AT gmail.com>.
-#
-# Version: 2.0 02-NOV-2009 jason.giedymin AT gmail.com
-# Notes: nginx init.d dash script for Ubuntu <=9.10.
-#
-# This script's project home is:
-#   http://code.google.com/p/nginx-init-ubuntu/
-#
-#------------------------------------------------------------------------------
-#                               Functions
-#------------------------------------------------------------------------------
-. /lib/lsb/init-functions
-
-#------------------------------------------------------------------------------
-#                               Consts
-#------------------------------------------------------------------------------
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+ 
+PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 DAEMON=/usr/local/nginx/sbin/nginx
-
-PS="nginx"
-PIDNAME="nginx"             #lets you do $PS-slave
-PIDFILE=$PIDNAME.pid                    #pid file
-PIDSPATH=/var/run
-
-DESCRIPTION="Nginx Server..."
-
-RUNAS=root                              #user to run as
-
-SCRIPT_OK=0                             #ala error codes
-SCRIPT_ERROR=1                          #ala error codes
-TRUE=1                                  #boolean
-FALSE=0                                 #boolean
-
-lockfile=/var/lock/subsys/nginx
-NGINX_CONF_FILE="/usr/local/nginx/conf/nginx.conf"
-
-#------------------------------------------------------------------------------
-#                               Simple Tests
-#------------------------------------------------------------------------------
-
-#test if nginx is a file and executable
+DAEMON_OPTS='-c /usr/local/nginx/conf/nginx.conf'
+NAME=nginx
+DESC=nginx
+ 
 test -x $DAEMON || exit 0
-
+ 
 # Include nginx defaults if available
 if [ -f /etc/default/nginx ] ; then
   . /etc/default/nginx
 fi
-
-#set exit condition
-#set -e
-
-#------------------------------------------------------------------------------
-#                               Functions
-#------------------------------------------------------------------------------
-
-setFilePerms(){
-
-  if [ -f $PIDSPATH/$PIDFILE ]; then
-    chmod 400 $PIDSPATH/$PIDFILE
-  fi
-}
-
-configtest() {
-  $DAEMON -t -c $NGINX_CONF_FILE
-}
-
-getPSCount() {
-  return `pgrep -f $PS | wc -l`
-}
-
-isRunning() {
-  if [ $1 ]; then
-    pidof_daemon $1
-    PID=$?
-
-    if [ $PID -gt 0 ]; then
-      return 1
-    else
-      return 0
-    fi
-  else
-    pidof_daemon
-    PID=$?
-
-    if [ $PID -gt 0 ]; then
-      return 1
-    else
-      return 0
-    fi
-  fi
-}
-
-#courtesy of php-fpm
-wait_for_pid () {
-  try=0
-
-  while test $try -lt 35 ; do
-
-    case "$1" in
-      'created')
-      if [ -f "$2" ] ; then
-        try=''
-        break
-      fi
-      ;;
-
-      'removed')
-      if [ ! -f "$2" ] ; then
-        try=''
-        break
-      fi
-      ;;
-    esac
-
-    #echo -n .
-    try=`expr $try + 1`
-    sleep 1
-  done
-}
-
-status(){
-  isRunning
-  isAlive=$?
-
-  if [ "${isAlive}" -eq $TRUE ]; then
-    echo "$PIDNAME found running with processes:  `pidof $PS`"
-  else
-    echo "$PIDNAME is NOT running."
-  fi
-}
-
-removePIDFile(){
-  if [ $1 ]; then
-    if [ -f $1 ]; then
-      rm -f $1
-    fi
-  else
-    #Do default removal
-    if [ -f $PIDSPATH/$PIDFILE ]; then
-      rm -f $PIDSPATH/$PIDFILE
-    fi
-  fi
-}
-
-start() {
-  log_daemon_msg "Starting $DESCRIPTION"
-
-  isRunning
-  isAlive=$?
-
-  if [ "${isAlive}" -eq $TRUE ]; then
-    log_end_msg $SCRIPT_ERROR
-  else
-    start-stop-daemon --start --quiet --chuid $RUNAS --pidfile $PIDSPATH/$PIDFILE --exec $DAEMON \
-    -- -c $NGINX_CONF_FILE
-    setFilePerms
-    log_end_msg $SCRIPT_OK
-  fi
-}
-
-stop() {
-  log_daemon_msg "Stopping $DESCRIPTION"
-
-  isRunning
-  isAlive=$?
-  if [ "${isAlive}" -eq $TRUE ]; then
-    start-stop-daemon --stop --quiet --pidfile $PIDSPATH/$PIDFILE
-
-    wait_for_pid 'removed' $PIDSPATH/$PIDFILE
-
-    if [ -n "$try" ] ; then
-      log_end_msg $SCRIPT_ERROR
-    else
-      removePIDFile
-      log_end_msg $SCRIPT_OK
-    fi
-
-  else
-    log_end_msg $SCRIPT_ERROR
-  fi
-}
-
-reload() {
-  configtest || return $?
-
-  log_daemon_msg "Reloading (via HUP) $DESCRIPTION"
-
-  isRunning
-  if [ $? -eq $TRUE ]; then
-    `killall -HUP $PS` #to be safe
-
-    log_end_msg $SCRIPT_OK
-  else
-    log_end_msg $SCRIPT_ERROR
-  fi
-}
-
-quietupgrade() {
-  log_daemon_msg "Peforming Quiet Upgrade $DESCRIPTION"
-
-  isRunning
-  isAlive=$?
-  if [ "${isAlive}" -eq $TRUE ]; then
-    kill -USR2 `cat $PIDSPATH/$PIDFILE`
-    kill -WINCH `cat $PIDSPATH/$PIDFILE.oldbin`
-
-    isRunning
-    isAlive=$?
-    if [ "${isAlive}" -eq $TRUE ]; then
-      kill -QUIT `cat $PIDSPATH/$PIDFILE.oldbin`
-      wait_for_pid 'removed' $PIDSPATH/$PIDFILE.oldbin
-      removePIDFile $PIDSPATH/$PIDFILE.oldbin
-
-      log_end_msg $SCRIPT_OK
-    else
-      log_end_msg $SCRIPT_ERROR
-
-      log_daemon_msg "ERROR! Reverting back to original $DESCRIPTION"
-
-      kill -HUP `cat $PIDSPATH/$PIDFILE`
-      kill -TERM `cat $PIDSPATH/$PIDFILE.oldbin`
-      kill -QUIT `cat $PIDSPATH/$PIDFILE.oldbin`
-
-      wait_for_pid 'removed' $PIDSPATH/$PIDFILE.oldbin
-      removePIDFile $PIDSPATH/$PIDFILE.oldbin
-
-      log_end_msg $SCRIPT_ok
-    fi
-  else
-    log_end_msg $SCRIPT_ERROR
-  fi
-}
-
-terminate() {
-  log_daemon_msg "Force terminating (via KILL) $DESCRIPTION"
-
-  PIDS=`pidof $PS` || true
-
-  [ -e $PIDSPATH/$PIDFILE ] && PIDS2=`cat $PIDSPATH/$PIDFILE`
-
-  for i in $PIDS; do
-    if [ "$i" = "$PIDS2" ]; then
-      kill $i
-      wait_for_pid 'removed' $PIDSPATH/$PIDFILE
-      removePIDFile
-    fi
-  done
-
-  log_end_msg $SCRIPT_OK
-}
-
-destroy() {
-  log_daemon_msg "Force terminating and may include self (via KILLALL) $DESCRIPTION"
-  killall $PS -q >> /dev/null 2>&1
-  log_end_msg $SCRIPT_OK
-}
-
-pidof_daemon() {
-  PIDS=`pidof $PS` || true
-
-  [ -e $PIDSPATH/$PIDFILE ] && PIDS2=`cat $PIDSPATH/$PIDFILE`
-
-  for i in $PIDS; do
-    if [ "$i" = "$PIDS2" ]; then
-      return 1
-    fi
-  done
-  return 0
-}
-
+ 
+set -e
+ 
 case "$1" in
   start)
-    start
+    echo -n "Starting $DESC: "
+    start-stop-daemon --start --quiet --pidfile /var/run/nginx.pid --exec $DAEMON -- $DAEMON_OPTS
+    echo "$NAME."
     ;;
   stop)
-    stop
+    echo -n "Stopping $DESC: "
+    start-stop-daemon --stop --quiet --pidfile /var/run/nginx.pid --exec $DAEMON
+    echo "$NAME."
     ;;
   restart|force-reload)
-    stop
-    sleep 3
-    start
+    echo -n "Restarting $DESC: "
+    start-stop-daemon --stop --quiet --pidfile /var/run/nginx.pid --exec $DAEMON
+    sleep 1
+    start-stop-daemon --start --quiet --pidfile /var/run/nginx.pid --exec $DAEMON -- $DAEMON_OPTS
+    echo "$NAME."
     ;;
   reload)
-    $1
-    ;;
-  status)
-    status
+    echo -n "Reloading $DESC configuration: "
+    start-stop-daemon --stop --signal HUP --quiet --pidfile /var/run/nginx.pid \
+        --exec $DAEMON
+    echo "$NAME."
     ;;
   configtest)
-    $1
-    ;;
-  quietupgrade)
-    $1
-    ;;
-  terminate)
-    $1
-    ;;
-  destroy)
-    $1
+    $DAEMON -t $DAEMON_OPTS 
     ;;
   *)
-    FULLPATH=/etc/init.d/$PS
-    echo "Usage: $FULLPATH {start|stop|restart|force-reload|status|configtest|quietupgrade|terminate|destroy}"
-    echo "       The 'destroy' command should only be used as a last resort."
+    N=/etc/init.d/$NAME
+    echo "Usage: $N {start|stop|restart|configtest|force-reload}" >&2
     exit 1
     ;;
 esac
-
+ 
 exit 0

install.sh

@@ -449,6 +449,10 @@ IPADDR_COUNTRY_ISP=`./include/get_ipaddr_state.py $PUBLIC_IPADDR`
 IPADDR_COUNTRY=`echo $IPADDR_COUNTRY_ISP | awk '{print $1}'`
 [ "`echo $IPADDR_COUNTRY_ISP | awk '{print $2}'`"x == '1000323'x ] && IPADDR_ISP=aliyun
 
+# del openssl for jcloud
+[ -e "/usr/local/bin/openssl" ] && rm -rf /usr/local/bin/openssl
+[ -e "/usr/local/include/openssl" ] && rm -rf /usr/local/include/openssl
+
 # Check binary dependencies packages
 . ./include/check_sw.sh
 case "${OS}" in

versions.txt

@@ -48,7 +48,7 @@ zendopcache_version=7.0.5
 xcache_version=3.2.0
 apcu_version=4.0.11
 apcu_for_php7_version=5.1.8
-ImageMagick_version=6.9.8-0
+ImageMagick_version=6.9.8-2
 imagick_version=3.4.3
 imagick_for_php53_version=3.3.0
 GraphicsMagick_version=1.3.25

vhost.sh

@@ -186,7 +186,7 @@ Create_SSL() {
       for D in ${domain} ${moredomainame}
       do
         Domain_IPADDR=$(ping ${D} -c1 | sed '1{s/[^(]*(//;s/).*//;q}')
-        [ "${PUBLIC_IPADDR}" != "${Domain_IPADDR}" ] && { echo; echo "${CFAILURE}DNS problem: NXDOMAIN looking up A for ${D}${CEND}"; echo; exit 1; }
+        [ "${PUBLIC_IPADDR%.*}" != "${Domain_IPADDR%.*}" ] && { echo; echo "${CFAILURE}DNS problem: NXDOMAIN looking up A for ${D}${CEND}"; echo; exit 1; }
       done
 
       #add Email