- ported some patches

Marius Cramer

2015-04-15 d5f2d5f5504572a9c62aadbfc6f780bb08e1e156

 server/conf/hhvm_starter.master

@@ -37,15 +37,29 @@
   
   umask 017
   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="-vServer.IniFile=/var/www/conf/{SYSTEM_USER}/php.ini" ;
      INIFILE="--config /var/www/conf/{SYSTEM_USER}/php.ini" ;
   elif [[ -e "/etc/php5/hhvm/php.ini" ]] ; then
      INIFILE="-vServer.IniFile=/etc/php5/hhvm/php.ini" ;
      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="-vServer.IniFile=/etc/php5/cgi/php.ini" ;
      INIFILE="--config /etc/php5/cgi/php.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 $INIFILE -vPidFile=/var/run/hhvm/hhvm_{SYSTEM_USER}.pid & echo $! > /var/run/hhvm/hhvm_{SYSTEM_USER}.pid
	
   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()