Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: toollabs: move templates to role
......................................................................
toollabs: move templates to role
Change-Id: I5049666ca97cf9bb75d8ba11a08a4032fa3a2d36
---
M modules/role/manifests/toollabs/elasticsearch.pp
R modules/role/templates/toollabs/elasticsearch/nginx.conf.erb
2 files changed, 1 insertion(+), 1 deletion(-)
Approvals:
Elukey: Looks good to me, but someone else must approve
Giuseppe Lavagetto: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/role/manifests/toollabs/elasticsearch.pp
b/modules/role/manifests/toollabs/elasticsearch.pp
index cfe293e..346fcb8 100644
--- a/modules/role/manifests/toollabs/elasticsearch.pp
+++ b/modules/role/manifests/toollabs/elasticsearch.pp
@@ -13,7 +13,7 @@
$auth_realm = 'Elasticsearch protected actions'
$auth_file = '/etc/nginx/elasticsearch.htpasswd'
nginx::site { 'elasticsearch':
- content => template('labs/toollabs/elasticsearch/nginx.conf.erb'),
+ content => template('role/toollabs/elasticsearch/nginx.conf.erb'),
}
file { '/etc/nginx/elasticsearch.htpasswd':
diff --git a/templates/labs/toollabs/elasticsearch/nginx.conf.erb
b/modules/role/templates/toollabs/elasticsearch/nginx.conf.erb
similarity index 100%
rename from templates/labs/toollabs/elasticsearch/nginx.conf.erb
rename to modules/role/templates/toollabs/elasticsearch/nginx.conf.erb
--
To view, visit https://gerrit.wikimedia.org/r/310781
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5049666ca97cf9bb75d8ba11a08a4032fa3a2d36
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Elukey <ltosc...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
