From 9d9ea6f6d55cfb018e1cbfe9d96c1ae67390069d Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 11 Aug 2014 06:35:26 -0400
Subject: [PATCH] - added hhvm php.ini file usage
---
server/conf/hhvm_starter.master | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/server/conf/hhvm_starter.master b/server/conf/hhvm_starter.master
index 3a6277d..57f9324 100644
--- a/server/conf/hhvm_starter.master
+++ b/server/conf/hhvm_starter.master
@@ -33,7 +33,15 @@
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 -vServer.FixPathInfo=true -vPidFile=/var/run/hhvm/hhvm_{SYSTEM_USER}.pid & echo $! > /var/run/hhvm/hhvm_{SYSTEM_USER}.pid
+ INIFILE=""
+ if [[ -e "/var/www/conf/{SYSTEM_USER}/php.ini" ]] ; then
+ INIFILE="-vServer.IniFile=/var/www/conf/{SYSTEM_USER}/php.ini" ;
+ elif [[ -e "/etc/php5/hhvm/php.ini" ]] ; then
+ INIFILE="-vServer.IniFile=/etc/php5/hhvm/php.ini" ;
+ elif [[ -e "/etc/php5/cgi/php.ini" ]] ; then
+ INIFILE="-vServer.IniFile=/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=true $INIFILE -vPidFile=/var/run/hhvm/hhvm_{SYSTEM_USER}.pid & echo $! > /var/run/hhvm/hhvm_{SYSTEM_USER}.pid
}
do_stop()
--
Gitblit v1.9.1