Skip to content

Instantly share code, notes, and snippets.

@ptarjan
Created March 27, 2014 00:14
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save ptarjan/9796917 to your computer and use it in GitHub Desktop.
Save ptarjan/9796917 to your computer and use it in GitHub Desktop.
diff --git i/hphp/runtime/base/program-functions.cpp w/hphp/runtime/base/program-functions.cpp
index 392e1cc..ecc22a0 100644
--- i/hphp/runtime/base/program-functions.cpp
+++ w/hphp/runtime/base/program-functions.cpp
@@ -1149,6 +1149,11 @@ static int execute_program_impl(int argc, char** argv) {
Logger::Verbose("Using default config file: %s", default_config_file);
po.config.push_back(default_config_file);
}
+ auto default_config_file = "/etc/hhvm/config.hdf";
+ if (access(default_config_file, R_OK) != -1) {
+ Logger::Verbose("Using default config file: %s", default_config_file);
+ po.config.push_back(default_config_file);
+ }
}
} catch (error &e) {
Logger::Error("Error in command line: %s", e.what());
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment