Giuseppe Lavagetto has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/310788

Change subject: url_downloader: move templates to role module
......................................................................

url_downloader: move templates to role module

Change-Id: Id4a2a08fac9d8d4d8d5b94efc3d8dee2918af41f
---
M manifests/role/url_downloader.pp
R modules/role/templates/url_downloader/squid.conf.erb
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/88/310788/1

diff --git a/manifests/role/url_downloader.pp b/manifests/role/url_downloader.pp
index 901c93e..76f8f00 100644
--- a/manifests/role/url_downloader.pp
+++ b/manifests/role/url_downloader.pp
@@ -89,9 +89,9 @@
     $towikimedia = $wikimedia
 
     if os_version('ubuntu >= trusty') or os_version('debian >= jessie') {
-        $config_content = template('url_downloader/squid.conf.erb')
+        $config_content = template('role/url_downloader/squid.conf.erb')
     } else {
-        $config_content = template('role/squid3/precise_acls_conf.erb', 
'url_downloader/squid.conf.erb')
+        $config_content = template('role/squid3/precise_acls_conf.erb', 
'role/url_downloader/squid.conf.erb')
     }
 
     class { 'squid3':
diff --git a/templates/url_downloader/squid.conf.erb 
b/modules/role/templates/url_downloader/squid.conf.erb
similarity index 100%
rename from templates/url_downloader/squid.conf.erb
rename to modules/role/templates/url_downloader/squid.conf.erb

-- 
To view, visit https://gerrit.wikimedia.org/r/310788
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id4a2a08fac9d8d4d8d5b94efc3d8dee2918af41f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to