Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: Allow host-specific HHVM config overrides via Hiera
......................................................................
Allow host-specific HHVM config overrides via Hiera
Change-Id: I5d70d3aaddded11ea73f9842ef9beb241a074678
Signed-off-by: Giuseppe Lavagetto <glavage...@wikimedia.org>
---
M modules/hhvm/manifests/init.pp
1 file changed, 5 insertions(+), 2 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/hhvm/manifests/init.pp b/modules/hhvm/manifests/init.pp
index 9e889b6..bc83ca5 100644
--- a/modules/hhvm/manifests/init.pp
+++ b/modules/hhvm/manifests/init.pp
@@ -151,18 +151,21 @@
}
}
+ $cli_hiera = hiera_hash('hhvm::extra::cli', {})
+ $fcgi_hiera = hiera_hash('hhvm::extra::fcgi', {})
+
## Config files
file { '/etc/hhvm/php.ini':
- content => php_ini($common_defaults, $cli_defaults, $cli_settings),
+ content => php_ini($common_defaults, $cli_defaults, $cli_settings,
$cli_hiera),
owner => 'root',
group => 'root',
mode => '0444',
}
file { '/etc/hhvm/fcgi.ini':
- content => php_ini($common_defaults, $fcgi_defaults, $fcgi_settings),
+ content => php_ini($common_defaults, $fcgi_defaults, $fcgi_settings,
$fcgi_hiera),
owner => 'root',
group => 'root',
mode => '0444',
--
To view, visit https://gerrit.wikimedia.org/r/175425
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5d70d3aaddded11ea73f9842ef9beb241a074678
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
