Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: templates: move squid3 to role module
......................................................................
templates: move squid3 to role module
Change-Id: I869e8baaf437036e1fdb6d7858b9c8c0bc340246
---
M manifests/role/installserver.pp
M manifests/role/url_downloader.pp
R modules/role/templates/squid3/precise_acls_conf.erb
3 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Elukey: Looks good to me, but someone else must approve
Giuseppe Lavagetto: Verified; Looks good to me, approved
diff --git a/manifests/role/installserver.pp b/manifests/role/installserver.pp
index caddbe7..ca5e2b0 100644
--- a/manifests/role/installserver.pp
+++ b/manifests/role/installserver.pp
@@ -32,7 +32,7 @@
if os_version('ubuntu >= trusty') or os_version('debian >= jessie') {
$config_content = template('role/caching-proxy/squid.conf.erb')
} else {
- $config_content = template('squid3/precise_acls_conf.erb',
'role/caching-proxy/squid.conf.erb')
+ $config_content = template('role/squid3/precise_acls_conf.erb',
'role/caching-proxy/squid.conf.erb')
}
class { 'squid3':
diff --git a/manifests/role/url_downloader.pp b/manifests/role/url_downloader.pp
index d073774..901c93e 100644
--- a/manifests/role/url_downloader.pp
+++ b/manifests/role/url_downloader.pp
@@ -91,7 +91,7 @@
if os_version('ubuntu >= trusty') or os_version('debian >= jessie') {
$config_content = template('url_downloader/squid.conf.erb')
} else {
- $config_content = template('squid3/precise_acls_conf.erb',
'url_downloader/squid.conf.erb')
+ $config_content = template('role/squid3/precise_acls_conf.erb',
'url_downloader/squid.conf.erb')
}
class { 'squid3':
diff --git a/templates/squid3/precise_acls_conf.erb
b/modules/role/templates/squid3/precise_acls_conf.erb
similarity index 100%
rename from templates/squid3/precise_acls_conf.erb
rename to modules/role/templates/squid3/precise_acls_conf.erb
--
To view, visit https://gerrit.wikimedia.org/r/310786
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I869e8baaf437036e1fdb6d7858b9c8c0bc340246
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Elukey <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
