Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/191015
Change subject: url_downloader: Vary squid config base on OS version
......................................................................
url_downloader: Vary squid config base on OS version
Trusty has squid 3.3 which contains embedded 3 ACLs which are not
present in precise's squid 3.1. Squid 3.3 will not start with those 3
ACLs defined in the configuration. Based on the os_version function prepend
the ACLs on precise and don't include them on trusty
Change-Id: I588f9e65d78c8c87cae1bcfd6b40f56477d52c62
---
M manifests/role/url_downloader.pp
1 file changed, 7 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/15/191015/1
diff --git a/manifests/role/url_downloader.pp b/manifests/role/url_downloader.pp
index 61a09aa..251f63a 100644
--- a/manifests/role/url_downloader.pp
+++ b/manifests/role/url_downloader.pp
@@ -26,8 +26,14 @@
description => 'Upload-by-URL proxy'
}
+ if os_version('ubuntu >= trusty') {
+ $config_content => template('url_downloader/squid.conf.erb')
+ } else {
+ $config_content => template('url_downloader/precise_acls_conf.erb',
'url_downloader/squid.conf.erb')
+ }
+
class { 'squid3':
- config_content => template('url_downloader/squid.conf.erb'),
+ config_content => $config_content,
}
# Firewall
--
To view, visit https://gerrit.wikimedia.org/r/191015
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I588f9e65d78c8c87cae1bcfd6b40f56477d52c62
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
