Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: templates: move apache templates to the role module
......................................................................


templates: move apache templates to the role module

Change-Id: Id267b2d1f692bbe5659ccbf5e1ef200fb57fc369
---
M manifests/role/simplestatic.pp
M manifests/role/xenon.pp
M manifests/role/xhgui.pp
M modules/role/manifests/grafana/base.pp
M modules/role/manifests/microsites/transparency.pp
M modules/role/manifests/performance/site.pp
M modules/role/manifests/piwik/server.pp
R modules/role/templates/apache/sites/grafana-admin.erb
R modules/role/templates/apache/sites/grafana-readonly.erb
R modules/role/templates/apache/sites/performance.wikimedia.org.erb
R modules/role/templates/apache/sites/piwik.wikimedia.org.erb
R modules/role/templates/apache/sites/simplestatic.erb
R modules/role/templates/apache/sites/transparency.wikimedia.org.erb
R modules/role/templates/apache/sites/xenon.erb
R modules/role/templates/apache/sites/xhgui.erb
15 files changed, 8 insertions(+), 8 deletions(-)

Approvals:
  Giuseppe Lavagetto: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/role/simplestatic.pp b/manifests/role/simplestatic.pp
index a09dcff..6c8980e 100644
--- a/manifests/role/simplestatic.pp
+++ b/manifests/role/simplestatic.pp
@@ -15,6 +15,6 @@
 
     apache::site { 'simplestatic':
         ensure  => present,
-        content => template('apache/sites/simplestatic.erb'),
+        content => template('role/apache/sites/simplestatic.erb'),
     }
 }
diff --git a/manifests/role/xenon.pp b/manifests/role/xenon.pp
index 655a53e..dcdac19 100644
--- a/manifests/role/xenon.pp
+++ b/manifests/role/xenon.pp
@@ -21,7 +21,7 @@
     Service['redis-server'] ~> Service['xenon-log']
 
     apache::site { 'xenon':
-        content => template('apache/sites/xenon.erb'),
+        content => template('role/apache/sites/xenon.erb'),
     }
 
     ferm::service { 'xenon_http':
diff --git a/manifests/role/xhgui.pp b/manifests/role/xhgui.pp
index 8103532..c9a41db 100644
--- a/manifests/role/xhgui.pp
+++ b/manifests/role/xhgui.pp
@@ -96,6 +96,6 @@
     } ->
 
     apache::site { 'xhgui_apache_site':
-        content => template('apache/sites/xhgui.erb'),
+        content => template('role/apache/sites/xhgui.erb'),
     }
 }
diff --git a/modules/role/manifests/grafana/base.pp 
b/modules/role/manifests/grafana/base.pp
index 091d648..e27d166 100644
--- a/modules/role/manifests/grafana/base.pp
+++ b/modules/role/manifests/grafana/base.pp
@@ -174,7 +174,7 @@
     #
 
     apache::site { $readonly_domain:
-        content => template('apache/sites/grafana-readonly.erb'),
+        content => template('role/apache/sites/grafana-readonly.erb'),
         require => Class['::grafana'],
     }
 
@@ -184,7 +184,7 @@
     }
 
     apache::site { $admin_domain:
-        content => template('apache/sites/grafana-admin.erb'),
+        content => template('role/apache/sites/grafana-admin.erb'),
         require => Class['::grafana'],
     }
 
diff --git a/modules/role/manifests/microsites/transparency.pp 
b/modules/role/manifests/microsites/transparency.pp
index 221ab5a..5fbe70b 100644
--- a/modules/role/manifests/microsites/transparency.pp
+++ b/modules/role/manifests/microsites/transparency.pp
@@ -48,7 +48,7 @@
     }
 
     apache::site { 'transparency.wikimedia.org':
-        content => template('apache/sites/transparency.wikimedia.org.erb'),
+        content => 
template('role/apache/sites/transparency.wikimedia.org.erb'),
     }
 
     ferm::service { 'transparency_http':
diff --git a/modules/role/manifests/performance/site.pp 
b/modules/role/manifests/performance/site.pp
index bfd9e42..34c2bd9 100644
--- a/modules/role/manifests/performance/site.pp
+++ b/modules/role/manifests/performance/site.pp
@@ -23,7 +23,7 @@
     }
 
     apache::site { 'performance.wikimedia.org':
-        content => template('apache/sites/performance.wikimedia.org.erb'),
+        content => template('role/apache/sites/performance.wikimedia.org.erb'),
         require => Git::Clone['performance/docroot'],
     }
 
diff --git a/modules/role/manifests/piwik/server.pp 
b/modules/role/manifests/piwik/server.pp
index c6fd73a..f77e1ea 100644
--- a/modules/role/manifests/piwik/server.pp
+++ b/modules/role/manifests/piwik/server.pp
@@ -57,7 +57,7 @@
     }
 
     apache::site { 'piwik.wikimedia.org':
-        content => template('apache/sites/piwik.wikimedia.org.erb'),
+        content => template('role/apache/sites/piwik.wikimedia.org.erb'),
     }
 
     monitoring::service { 'piwik':
diff --git a/templates/apache/sites/grafana-admin.erb 
b/modules/role/templates/apache/sites/grafana-admin.erb
similarity index 100%
rename from templates/apache/sites/grafana-admin.erb
rename to modules/role/templates/apache/sites/grafana-admin.erb
diff --git a/templates/apache/sites/grafana-readonly.erb 
b/modules/role/templates/apache/sites/grafana-readonly.erb
similarity index 100%
rename from templates/apache/sites/grafana-readonly.erb
rename to modules/role/templates/apache/sites/grafana-readonly.erb
diff --git a/templates/apache/sites/performance.wikimedia.org.erb 
b/modules/role/templates/apache/sites/performance.wikimedia.org.erb
similarity index 100%
rename from templates/apache/sites/performance.wikimedia.org.erb
rename to modules/role/templates/apache/sites/performance.wikimedia.org.erb
diff --git a/templates/apache/sites/piwik.wikimedia.org.erb 
b/modules/role/templates/apache/sites/piwik.wikimedia.org.erb
similarity index 100%
rename from templates/apache/sites/piwik.wikimedia.org.erb
rename to modules/role/templates/apache/sites/piwik.wikimedia.org.erb
diff --git a/templates/apache/sites/simplestatic.erb 
b/modules/role/templates/apache/sites/simplestatic.erb
similarity index 100%
rename from templates/apache/sites/simplestatic.erb
rename to modules/role/templates/apache/sites/simplestatic.erb
diff --git a/templates/apache/sites/transparency.wikimedia.org.erb 
b/modules/role/templates/apache/sites/transparency.wikimedia.org.erb
similarity index 100%
rename from templates/apache/sites/transparency.wikimedia.org.erb
rename to modules/role/templates/apache/sites/transparency.wikimedia.org.erb
diff --git a/templates/apache/sites/xenon.erb 
b/modules/role/templates/apache/sites/xenon.erb
similarity index 100%
rename from templates/apache/sites/xenon.erb
rename to modules/role/templates/apache/sites/xenon.erb
diff --git a/templates/apache/sites/xhgui.erb 
b/modules/role/templates/apache/sites/xhgui.erb
similarity index 100%
rename from templates/apache/sites/xhgui.erb
rename to modules/role/templates/apache/sites/xhgui.erb

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id267b2d1f692bbe5659ccbf5e1ef200fb57fc369
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@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