Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/169630
Change subject: hhvm: make HHVM's working directory be /var/tmp/hhvm
......................................................................
hhvm: make HHVM's working directory be /var/tmp/hhvm
jemalloc heap dumps go to the process's working directory by default.
Presumably there are other code-paths in HHVM that default to writing data to
the current working directory. It's important, therefore, that HHVM's working
directory not be in the /run ramdisk, because that can easily fill up.
Also make Exec['install_hhvm_source_files'] require Package['dpkg-dev']
Change-Id: I777ae49cae7cb8bdbdf5bb59c5037ce514c51bb4
---
M modules/admin/files/home/ori/.binned/mw
M modules/hhvm/files/hhvm.conf
M modules/hhvm/manifests/init.pp
3 files changed, 8 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/30/169630/1
diff --git a/modules/admin/files/home/ori/.binned/mw
b/modules/admin/files/home/ori/.binned/mw
index b6aced6..50ea7c3 100755
--- a/modules/admin/files/home/ori/.binned/mw
+++ b/modules/admin/files/home/ori/.binned/mw
@@ -1,7 +1,6 @@
#!/usr/bin/env php
<?php
-
-list( $__script, $__wiki ) = array_slice( $argv, 1 );
+@list( $__script, $__wiki ) = array_slice( $argv, 1 );
if ( strpos( $__script, '.php' ) === false ) {
list( $__wiki, $__script ) = array( $__script, $__wiki );
}
diff --git a/modules/hhvm/files/hhvm.conf b/modules/hhvm/files/hhvm.conf
index fc19065..523fd6f 100644
--- a/modules/hhvm/files/hhvm.conf
+++ b/modules/hhvm/files/hhvm.conf
@@ -11,7 +11,8 @@
mkdir -p -m0755 "${HHVM_RUN_DIR:=/run/hhvm}"
mkdir -p -m0750 "${HHVM_RUN_DIR}/cache"
mkdir -p -m0775 "${HHVM_LOG_DIR:=/var/log/hhvm}"
- chown -R "${HHVM_USER:=www-data}:${HHVM_GROUP:=www-data}" "$HHVM_RUN_DIR"
+ mkdir -p -m0775 "${HHVM_TMP_DIR:=/var/tmp/hhvm}"
+ chown -R "${HHVM_USER:=www-data}:${HHVM_GROUP:=www-data}" "$HHVM_RUN_DIR"
"$HHVM_TMP_DIR"
chown -R "syslog:${HHVM_GROUP}" "$HHVM_LOG_DIR"
# Update the symlink `/usr/lib/x86_64-linux-gnu/hhvm/extensions/current`
@@ -36,7 +37,7 @@
exec /sbin/start-stop-daemon --quiet --start \
--chuid "${HHVM_USER:-www-data}:${HHVM_GROUP:-www-data}" \
--make-pidfile --pidfile "${HHVM_RUN_DIR:-/run/hhvm}/hhvm.pid" \
- --chdir "${HHVM_RUN_DIR:-/run/hhvm}" \
+ --chdir "${HHVM_TMP_DIR:-/var/tmp/hhvm}" \
--startas /usr/bin/hhvm -- \
--config "${HHVM_CONFIG_DIR:-/etc/hhvm}/fcgi.ini" \
--mode server
diff --git a/modules/hhvm/manifests/init.pp b/modules/hhvm/manifests/init.pp
index 05125c4..d6fa760 100644
--- a/modules/hhvm/manifests/init.pp
+++ b/modules/hhvm/manifests/init.pp
@@ -213,9 +213,10 @@
require_package('dpkg-dev')
exec { 'install_hhvm_source_files':
- command => template('hhvm/install_hhvm_source_files.sh.erb'),
- creates => '/usr/local/src/hhvm',
- provider => 'shell',
+ command => template('hhvm/install_hhvm_source_files.sh.erb'),
+ creates => '/usr/local/src/hhvm',
+ provider => 'shell',
+ require => Package['dpkg-dev'],
}
--
To view, visit https://gerrit.wikimedia.org/r/169630
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I777ae49cae7cb8bdbdf5bb59c5037ce514c51bb4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
