Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/163101
Change subject: Fix config paths so that hhvm is not broken by default ...................................................................... Fix config paths so that hhvm is not broken by default Change-Id: I0fb0e4f47f84d60e275bc043e773056f2288530d Signed-off-by: Giuseppe Lavagetto <[email protected]> --- M debian/changelog A debian/patches/fix-config-path.patch M debian/patches/series 3 files changed, 35 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/hhvm refs/changes/01/163101/1 diff --git a/debian/changelog b/debian/changelog index 97d996a..83e7e40 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,10 @@ -hhvm (3.3.0-20140925+wmf1) UNRELEASED; urgency=medium +hhvm (3.3.0-20140925+wmf2) trusty-wikimedia; urgency=medium + + * Fix config files path. + + -- Giuseppe Lavagetto <[email protected]> Fri, 26 Sep 2014 08:00:57 +0200 + +hhvm (3.3.0-20140925+wmf1) trusty-wikimedia; urgency=medium * New upstream version * Added a few patches to fix bugs in production diff --git a/debian/patches/fix-config-path.patch b/debian/patches/fix-config-path.patch new file mode 100644 index 0000000..6130767 --- /dev/null +++ b/debian/patches/fix-config-path.patch @@ -0,0 +1,27 @@ +Description: do not prefix the configuration path with the INSTALL_PREFIX. + For some strange reason, INSTALL_PREFIX (in our case, /usr) was prepended to + the config file path, thus breaking any standard and using the ugly /usr/etc/hhvm + dir. + +Author: Giuseppe Lavagetto <[email protected]> +Last-Updated: 2014-09-26 + +diff --git a/hphp/runtime/base/emulate-zend.cpp b/hphp/runtime/base/emulate-zend.cpp +index 52636af..f2af4f1 100644 +--- a/hphp/runtime/base/emulate-zend.cpp ++++ b/hphp/runtime/base/emulate-zend.cpp +@@ -229,12 +229,12 @@ int emulate_zend(int argc, char** argv) { + + // If the -c option is specified without a -n, php behavior is to + // load the default ini/hdf +- auto default_config_file = INSTALL_PREFIX "/etc/hhvm/php.ini"; ++ auto default_config_file = "/etc/hhvm/php.ini"; + if (access(default_config_file, R_OK) != -1) { + newargv.push_back("-c"); + newargv.push_back(default_config_file); + } +- default_config_file = INSTALL_PREFIX "/etc/hhvm/config.hdf"; ++ default_config_file = "/etc/hhvm/config.hdf"; + if (access(default_config_file, R_OK) != -1) { + newargv.push_back("-c"); + newargv.push_back(default_config_file); diff --git a/debian/patches/series b/debian/patches/series index 60d788c..1592731 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,6 @@ remove_libpam.patch typos.patch +fix-config-path.patch # Wikimedia-specific (waiting for upstream merge) Make-RUSAGE_THREAD-available-to-getrusage.patch -- To view, visit https://gerrit.wikimedia.org/r/163101 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0fb0e4f47f84d60e275bc043e773056f2288530d Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/hhvm Gerrit-Branch: master Gerrit-Owner: Giuseppe Lavagetto <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
