- don't set password via remoting if field is empty

Marius Cramer

2015-08-06 37b29231e47a0c4458dc1c15d98588f16f07e1e2

 server/conf/hhvm_starter.master

@@ -17,13 +17,49 @@
do_start()
{
   if [ ! -d /var/run/hhvm ]; then
        mkdir -p -m0777 /var/run/hhvm
        else
        chmod 777 /var/run/hhvm
    fi
      mkdir -p -m0777 /var/run/hhvm
   else
      chmod 777 /var/run/hhvm
   fi
	
   if [[ -e "/var/run/hhvm/hhvm_{SYSTEM_USER}.pid" ]] ; then
      kill -0 `cat /var/run/hhvm/hhvm_{SYSTEM_USER}.pid` >/dev/null 2>&1 ;
      case "$?" in
         0)
            return 1
            ;;
      esac
   fi
	
   if [[ -S /var/run/mysqld/mysqld.sock && ! -S /tmp/mysql.sock ]] ; then
      ln -s /var/run/mysqld/mysqld.sock /tmp/mysql.sock ;
   fi
	
   umask 017
    sudo -u {SYSTEM_USER} touch /var/run/hhvm/hhvm_{SYSTEM_USER}.pid
    /usr/bin/hhvm --mode daemon -vServer.Type=fastcgi --user {SYSTEM_USER} -vServer.FileSocket=/var/run/hhvm/hhvm.{SYSTEM_USER}.sock -vLog.Level=Warning -vLog.UseLogFile=false -vRepo.Central.Path=/var/run/hhvm/hhvm.{SYSTEM_USER}.hhbc -vPidFile=/var/run/hhvm/hhvm_{SYSTEM_USER}.pid & echo $! > /var/run/hhvm/hhvm_{SYSTEM_USER}.pid
   sudo -u {SYSTEM_USER} touch /var/run/hhvm/hhvm_{SYSTEM_USER}.pid
	
   BASEINIFILE=""
   if [[ -e "/etc/hhvm/php.ini" ]] ; then
      BASEINIFILE="--config /etc/hhvm/php.ini" ;
   fi
	
   INIFILE=""
   if [[ -e "/var/www/conf/{SYSTEM_USER}/php.ini" ]] ; then
      INIFILE="--config /var/www/conf/{SYSTEM_USER}/php.ini" ;
   elif [[ -e "/etc/php5/hhvm/php.ini" ]] ; then
      INIFILE="--config /etc/php5/hhvm/php.ini" ;
   elif [[ -e "/etc/php5/fpm/php.ini" ]] ; then
      INIFILE="--config /etc/php5/fpm/php.ini" ;
   elif [[ -e "/etc/php5/cgi/php.ini" ]] ; then
      INIFILE="--config /etc/php5/cgi/php.ini" ;
   fi
	
   CUSTOMINIFILE=""
   if [[ -e "/etc/hhvm/{SYSTEM_USER}.ini" ]] ; then
      CUSTOMINIFILE="--config /etc/hhvm/{SYSTEM_USER}.ini" ;
   fi
	
   /usr/bin/hhvm --mode daemon -vServer.Type=fastcgi --user {SYSTEM_USER} -vServer.FileSocket=/var/run/hhvm/hhvm.{SYSTEM_USER}.sock -vLog.Level=Warning -vLog.UseLogFile=false -vRepo.Central.Path=/var/run/hhvm/hhvm.{SYSTEM_USER}.hhbc -vServer.FixPathInfo=false $BASEINIFILE $INIFILE $CUSTOMINIFILE -vPidFile=/var/run/hhvm/hhvm_{SYSTEM_USER}.pid & echo $! > /var/run/hhvm/hhvm_{SYSTEM_USER}.pid
}

do_stop()
@@ -35,25 +71,25 @@
}

case "$1" in
  start)
        do_start
        ;;
  stop)
        do_stop
        ;;
  restart|force-reload)
        do_stop
        case "$?" in
          0|1)
                do_start
                ;;
          *)
                ;;
        esac
        ;;
  *)
        exit 3
        ;;
   start)
      do_start
      ;;
   stop)
      do_stop
      ;;
   restart|force-reload)
      do_stop
      case "$?" in
         0|1)
            do_start
            ;;
         *)
            ;;
      esac
      ;;
   *)
      exit 3
      ;;
esac

: