Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168006
Change subject: move 'noc' from misc to module
......................................................................
move 'noc' from misc to module
Change-Id: I16ce9776a94c554fc0f6f4291c0fd94fc8ee41d3
---
M manifests/site.pp
R modules/noc/manifests/init.pp
R modules/noc/templates/noc.wikimedia.org.erb
3 files changed, 3 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/06/168006/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 224c679..73bf6a6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2616,7 +2616,7 @@
include misc::monitoring::jobqueue
include generic::wikidev-umask
include misc::deployment::common_scripts
- include misc::noc-wikimedia
+ include role::noc-wikimedia
$domain_search = [
'wikimedia.org',
diff --git a/manifests/misc/noc.pp b/modules/noc/manifests/init.pp
similarity index 80%
rename from manifests/misc/noc.pp
rename to modules/noc/manifests/init.pp
index 8082e9f..7652d09 100644
--- a/manifests/misc/noc.pp
+++ b/modules/noc/manifests/init.pp
@@ -1,14 +1,13 @@
# https://noc.wikimedia.org/
-class misc::noc-wikimedia {
- system::role { 'misc::noc-wikimedia': description => 'noc.wikimedia.org' }
+class noc-wikimedia {
include ::apache
$ssl_settings = ssl_ciphersuite('apache-2.2', 'compat')
apache::site { 'noc.wikimedia.org':
- content => template('apache/sites/noc.wikimedia.org.erb'),
+ content => template('noc/noc.wikimedia.org.erb'),
}
# ensure default site is removed
diff --git a/templates/apache/sites/noc.wikimedia.org.erb
b/modules/noc/templates/noc.wikimedia.org.erb
similarity index 100%
rename from templates/apache/sites/noc.wikimedia.org.erb
rename to modules/noc/templates/noc.wikimedia.org.erb
--
To view, visit https://gerrit.wikimedia.org/r/168006
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I16ce9776a94c554fc0f6f4291c0fd94fc8ee41d3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
