Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: kibana: move templates to role
......................................................................


kibana: move templates to role

Change-Id: I0ca0ed499967732304d441f761e6585b09e1afe8
---
M manifests/role/kibana.pp
R modules/role/templates/kibana/apache-auth-ldap.erb
R modules/role/templates/kibana/apache-auth-local.erb
R modules/role/templates/kibana/apache-auth-none.erb
R modules/role/templates/kibana/apache.conf.erb
5 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/kibana.pp b/manifests/role/kibana.pp
index 2f0a9c8..102d399 100644
--- a/manifests/role/kibana.pp
+++ b/manifests/role/kibana.pp
@@ -49,7 +49,7 @@
         fail('role::kibana::auth_type must be one of ldap, local, none')
     }
 
-    $apache_auth = template("kibana/apache-auth-${auth_type}.erb")
+    $apache_auth = template("role/kibana/apache-auth-${auth_type}.erb")
 
     ferm::service { 'kibana_frontend':
         proto   => 'tcp',
@@ -59,6 +59,6 @@
     }
 
     apache::site { $vhost:
-        content => template('kibana/apache.conf.erb'),
+        content => template('role/kibana/apache.conf.erb'),
     }
 }
diff --git a/templates/kibana/apache-auth-ldap.erb 
b/modules/role/templates/kibana/apache-auth-ldap.erb
similarity index 100%
rename from templates/kibana/apache-auth-ldap.erb
rename to modules/role/templates/kibana/apache-auth-ldap.erb
diff --git a/templates/kibana/apache-auth-local.erb 
b/modules/role/templates/kibana/apache-auth-local.erb
similarity index 100%
rename from templates/kibana/apache-auth-local.erb
rename to modules/role/templates/kibana/apache-auth-local.erb
diff --git a/templates/kibana/apache-auth-none.erb 
b/modules/role/templates/kibana/apache-auth-none.erb
similarity index 100%
rename from templates/kibana/apache-auth-none.erb
rename to modules/role/templates/kibana/apache-auth-none.erb
diff --git a/templates/kibana/apache.conf.erb 
b/modules/role/templates/kibana/apache.conf.erb
similarity index 100%
rename from templates/kibana/apache.conf.erb
rename to modules/role/templates/kibana/apache.conf.erb

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0ca0ed499967732304d441f761e6585b09e1afe8
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

Reply via email to