Ori.livneh has submitted this change and it was merged.
Change subject: HHVM: Get rid of HDF files
......................................................................
HHVM: Get rid of HDF files
All the configuration options we need to set now have .ini equivalents, so
migrate the remaining bits of HDF configuration to .ini.
I'll clean up files manually.
Change-Id: I5f9b5c4e452e914b33313d0774fb648c1cdfe7ad
---
D modules/hhvm/files/config-cli.hdf
D modules/hhvm/files/config.hdf
M modules/hhvm/files/hhvm.conf
M modules/hhvm/manifests/init.pp
4 files changed, 4 insertions(+), 60 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/hhvm/files/config-cli.hdf
b/modules/hhvm/files/config-cli.hdf
deleted file mode 100644
index 98120f8..0000000
--- a/modules/hhvm/files/config-cli.hdf
+++ /dev/null
@@ -1,17 +0,0 @@
-# Configuration for HHVM
-#
-# Note: HDF syntax is deprecated. Use php.ini where possible.
-# The configuration options declared in this file do not have
-# php.ini equivalents yet (Aug 2014).
-#
-# This file is managed by Puppet.
-DynamicExtensions {
- * = fss.so
- * = luasandbox.so
- * = wikidiff2.so
-}
-
-Eval {
- PerfPidMap = false
- Jit = false
-}
diff --git a/modules/hhvm/files/config.hdf b/modules/hhvm/files/config.hdf
deleted file mode 100644
index db9de1c..0000000
--- a/modules/hhvm/files/config.hdf
+++ /dev/null
@@ -1,16 +0,0 @@
-# Configuration for HHVM
-#
-# Note: HDF syntax is deprecated. Use php.ini where possible.
-# The configuration options declared in this file do not have
-# php.ini equivalents yet (Aug 2014).
-#
-# This file is managed by Puppet.
-DynamicExtensions {
- * = fss.so
- * = luasandbox.so
- * = wikidiff2.so
-}
-
-Eval {
- PerfPidMap = false
-}
diff --git a/modules/hhvm/files/hhvm.conf b/modules/hhvm/files/hhvm.conf
index cc77280..bf21fba 100644
--- a/modules/hhvm/files/hhvm.conf
+++ b/modules/hhvm/files/hhvm.conf
@@ -30,7 +30,6 @@
--chuid "${HHVM_USER:-www-data}:${HHVM_GROUP:-www-data}" \
--make-pidfile --pidfile "${HHVM_RUN_DIR:-/run/hhvm}/hhvm.pid" \
--startas /usr/bin/hhvm -- \
- --config "${HHVM_CONFIG_DIR:=/etc/hhvm/fcgi}/config.hdf" \
--config "${HHVM_CONFIG_DIR}/php.ini" \
--mode server
end script
diff --git a/modules/hhvm/manifests/init.pp b/modules/hhvm/manifests/init.pp
index d81f84e..1e1ee3b 100644
--- a/modules/hhvm/manifests/init.pp
+++ b/modules/hhvm/manifests/init.pp
@@ -7,24 +7,15 @@
#
# /etc/hhvm
# │
-# ├── config.hdf ┐
-# │ ├ Settings for CLI mode
-# ├── php.ini ┘
+# ├── php.ini # Settings for CLI mode
# │
# └── fcgi
# │
-# ├── config.hdf ┐
-# │ ├ Settings for FastCGI mode
-# └── php.ini ┘
+# └── php.ini # Settings for FastCGI mode
#
# The CLI configs are located in the paths HHVM automatically loads by
# default. This makes it easy to invoke HHVM from the command line,
# because no special arguments are required.
-#
-# HHVM is in the process of standardizing on the INI file format for
-# configuration files. At the moment (Aug 2014) there are still some
-# options that can only be set using the deprecated HDF syntax. This
-# is why we have two configuration files for each SAPI.
#
# The exact purpose of certain options is a little mysterious. The
# documentation is getting better, but expect to have to dig around in
@@ -109,9 +100,11 @@
date => { timezone => 'UTC' },
hhvm => {
dynamic_extension_path =>
'/usr/lib/x86_64-linux-gnu/hhvm/extensions/current',
+ dynamic_extensions => [ 'fss.so', 'luasandbox.so',
'wikidiff2.so' ],
enable_obj_destruct_call => true,
enable_zend_compat => true,
include_path => '.:/usr/share/php',
+ perf_pid_map => false,
pid_file => '', # PID file managed by
start-stop-daemon(8)
resource_limit => { core_file_size => to_bytes('8 Gb') },
log => {
@@ -171,21 +164,6 @@
file { '/etc/hhvm/fcgi/php.ini':
content => php_ini($common_defaults, $fcgi_defaults, $fcgi_settings),
- owner => 'root',
- group => 'root',
- mode => '0444',
- notify => Service['hhvm'],
- }
-
- file { '/etc/hhvm/config.hdf':
- source => 'puppet:///modules/hhvm/config-cli.hdf',
- owner => 'root',
- group => 'root',
- mode => '0444',
- }
-
- file { '/etc/hhvm/fcgi/config.hdf':
- source => 'puppet:///modules/hhvm/config.hdf',
owner => 'root',
group => 'root',
mode => '0444',
--
To view, visit https://gerrit.wikimedia.org/r/164160
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5f9b5c4e452e914b33313d0774fb648c1cdfe7ad
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
