Ori.livneh has submitted this change and it was merged.
Change subject: HHVM: Update the extension dir path for 3.3 changes
......................................................................
HHVM: Update the extension dir path for 3.3 changes
As of 3.3+, the extension directory is located in
/usr/lib/x86_64-linux-gnu/hhvm/extensions; previously it was in
/usr/lib/hphp/extensions. This patch updates the module for the new path
hierarchy. To prevent breakage on the production HHVM app servers (which have
not been upgraded yet), I copied over the extension directory from the
old path to the new one.
Change-Id: Id032f68a3b31f1339c798295f82f9e3d5d519bfe
---
M modules/hhvm/files/hhvm.conf
M modules/hhvm/manifests/init.pp
2 files changed, 6 insertions(+), 5 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
diff --git a/modules/hhvm/files/hhvm.conf b/modules/hhvm/files/hhvm.conf
index 9da12e1..05c9273 100644
--- a/modules/hhvm/files/hhvm.conf
+++ b/modules/hhvm/files/hhvm.conf
@@ -14,10 +14,11 @@
chown -R "${HHVM_USER:=www-data}:${HHVM_GROUP:=www-data}" "$HHVM_RUN_DIR"
chown -R "syslog:${HHVM_GROUP}" "$HHVM_LOG_DIR"
- # Set the target of the symbolic link '/usr/lib/hphp/extensions/current'
- # to the directory whose name matches the extension API version of HHVM:
+ # Update the symlink `/usr/lib/x86_64-linux-gnu/hhvm/extensions/current`
+ # so it points to the directory whose name matches the extension API
+ # version (e.g. `/usr/lib/x86_64-linux-gnu/hhvm/extensions/20140829`).
API_VERSION="$(/usr/bin/hhvm --version | grep -Po '(?<=API: ).+')"
- ( cd /usr/lib/hphp/extensions; ln -Trsf "$API_VERSION" current; )
+ ( cd /usr/lib/x86_64-linux-gnu/hhvm/extensions; ln -Trsf "$API_VERSION"
current; )
end script
script
@@ -58,7 +59,7 @@
# Increase the maximum number of open files.
limit nofile 65536 65536
-# When 'hhvm.server.graceful_shutdown_wait' is set to a positive
+# When `hhvm.server.graceful_shutdown_wait` is set to a positive
# integer, HHVM will perform a graceful shutdown on SIGHUP.
kill signal HUP
diff --git a/modules/hhvm/manifests/init.pp b/modules/hhvm/manifests/init.pp
index 3739094..d3c29f9 100644
--- a/modules/hhvm/manifests/init.pp
+++ b/modules/hhvm/manifests/init.pp
@@ -84,7 +84,7 @@
$common_defaults = {
date => { timezone => 'UTC' },
hhvm => {
- dynamic_extension_path => '/usr/lib/hphp/extensions/current',
+ dynamic_extension_path =>
'/usr/lib/x86_64-linux-gnu/hhvm/extensions/current',
enable_obj_destruct_call => true,
enable_zend_compat => true,
include_path => '.:/usr/share/php',
--
To view, visit https://gerrit.wikimedia.org/r/161971
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id032f68a3b31f1339c798295f82f9e3d5d519bfe
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
