Faidon Liambotis has submitted this change and it was merged.
Change subject: webserver: add || debian >= jessie to os_version
......................................................................
webserver: add || debian >= jessie to os_version
Change-Id: Ibd0067a4ea45e4e98c43d7366a6546d8f1271c88
---
M modules/webserver/manifests/apache/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/webserver/manifests/apache/site.pp
b/modules/webserver/manifests/apache/site.pp
index 9f2be4e..ee3d09e 100644
--- a/modules/webserver/manifests/apache/site.pp
+++ b/modules/webserver/manifests/apache/site.pp
@@ -30,7 +30,7 @@
$ensure = 'present',
) {
- if os_version('ubuntu >= trusty') {
+ if os_version('debian >= jessie || ubuntu >= trusty') {
$ssl_settings = ssl_ciphersuite('apache-2.4', 'compat')
} else {
$ssl_settings = ssl_ciphersuite('apache-2.2', 'compat')
--
To view, visit https://gerrit.wikimedia.org/r/179074
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibd0067a4ea45e4e98c43d7366a6546d8f1271c88
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
