Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164296
Change subject: Collapse /etc/hhvm/fcgi into /etc/hhvm
......................................................................
Collapse /etc/hhvm/fcgi into /etc/hhvm
Since we now only have one config file for each SAPI, it doesn't make sense to
have a separate directly for FastCGI stuff. Instead just keep /etc/hhvm/php.ini
and /etc/hhvm/fcgi.ini.
Change-Id: I6f60a14c052a275681556490264737d75305b74a
---
M modules/hhvm/files/hhvm.conf
M modules/hhvm/manifests/init.pp
2 files changed, 7 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/96/164296/1
diff --git a/modules/hhvm/files/hhvm.conf b/modules/hhvm/files/hhvm.conf
index 2c6f8ed..a89f199 100644
--- a/modules/hhvm/files/hhvm.conf
+++ b/modules/hhvm/files/hhvm.conf
@@ -30,7 +30,7 @@
--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}/php.ini" \
+ --config "${HHVM_CONFIG_DIR:-/etc/hhvm}/fcgi.ini" \
--mode server
end script
@@ -40,7 +40,7 @@
# warmup.urls is an optional configuration file. If it exists, we
# expect it to be a list of URLs, one per line. We request each URL
# from HHVM on start-up.
- WARMUP_URLS_FILE="${HHVM_CONFIG_DIR:-/etc/hhvm/fcgi}/warmup.urls"
+ WARMUP_URLS_FILE="${HHVM_CONFIG_DIR:-/etc/hhvm}/warmup.urls"
grep -vEs '^[[:space:]]*(#|$)' "$WARMUP_URLS_FILE" | while read -r URL; do
HOST=$(echo "$URL" | cut -d/ -f3)
diff --git a/modules/hhvm/manifests/init.pp b/modules/hhvm/manifests/init.pp
index 1e1ee3b..18156d9 100644
--- a/modules/hhvm/manifests/init.pp
+++ b/modules/hhvm/manifests/init.pp
@@ -6,12 +6,8 @@
# The layout of configuration files in /etc/hhvm is as follows:
#
# /etc/hhvm
-# │
-# ├── php.ini # Settings for CLI mode
-# │
-# └── fcgi
-# │
-# └── php.ini # Settings for FastCGI mode
+# ├── php.ini # Settings for CLI mode
+# └── fcgi.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,
@@ -29,9 +25,7 @@
# HHVM is also configured to write stack traces to the same directory.
#
# /var/log/hhvm
-# │
# ├── error.log
-# │
# └── stacktrace.NNN.log.YYYYMMDD, ...
#
#
@@ -49,7 +43,6 @@
#
# [*fcgi_settings*]
# Ditto, except for FastCGI mode.
-#
#
# [*warmup_urls*]
# An array of URLs to fetch from the server on startup. Optional.
@@ -162,7 +155,7 @@
mode => '0444',
}
- file { '/etc/hhvm/fcgi/php.ini':
+ file { '/etc/hhvm/fcgi.ini':
content => php_ini($common_defaults, $fcgi_defaults, $fcgi_settings),
owner => 'root',
group => 'root',
@@ -170,7 +163,7 @@
notify => Service['hhvm'],
}
- file { '/etc/hhvm/fcgi/warmup.urls':
+ file { '/etc/hhvm/warmup.urls':
content => template('hhvm/warmup.urls.erb'),
owner => 'root',
group => 'root',
@@ -214,7 +207,7 @@
provider => 'upstart',
}
- file { [ '/etc/hhvm', '/etc/hhvm/fcgi' ]:
+ file { '/etc/hhvm':
ensure => directory,
owner => 'root',
group => 'root',
--
To view, visit https://gerrit.wikimedia.org/r/164296
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6f60a14c052a275681556490264737d75305b74a
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
