Dzahn has submitted this change and it was merged. Change subject: move 'noc' from misc to module ......................................................................
move 'noc' from misc to module Change-Id: I16ce9776a94c554fc0f6f4291c0fd94fc8ee41d3 --- A manifests/role/noc.pp M manifests/site.pp R modules/noc/manifests/init.pp R modules/noc/templates/noc.wikimedia.org.erb 4 files changed, 12 insertions(+), 6 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/manifests/role/noc.pp b/manifests/role/noc.pp new file mode 100644 index 0000000..39d2cdd --- /dev/null +++ b/manifests/role/noc.pp @@ -0,0 +1,8 @@ +# https://noc.wikimedia.org/ +class role::noc { + + system::role { 'role::noc': description => 'noc.wikimedia.org' } + + include ::noc +} + diff --git a/manifests/site.pp b/manifests/site.pp index 7904be2..e37fd13 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -2590,7 +2590,7 @@ include misc::monitoring::jobqueue include generic::wikidev-umask include misc::deployment::common_scripts - include misc::noc-wikimedia + include role::noc $domain_search = [ 'wikimedia.org', diff --git a/manifests/misc/noc.pp b/modules/noc/manifests/init.pp similarity index 77% rename from manifests/misc/noc.pp rename to modules/noc/manifests/init.pp index 8082e9f..569f51a 100644 --- a/manifests/misc/noc.pp +++ b/modules/noc/manifests/init.pp @@ -1,14 +1,12 @@ # https://noc.wikimedia.org/ - -class misc::noc-wikimedia { - system::role { 'misc::noc-wikimedia': description => 'noc.wikimedia.org' } +class noc { 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 @@ -25,7 +23,7 @@ # caches the ganglia xml data from gmetric used by dbtree every minute cron { 'dbtree_cache_cron': command => "/usr/bin/curl -s 'http://noc.wikimedia.org/dbtree/?recache=true' >/dev/null", - user => www-data, + user => 'www-data', minute => '*', } } 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: merged Gerrit-Change-Id: I16ce9776a94c554fc0f6f4291c0fd94fc8ee41d3 Gerrit-PatchSet: 5 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn <[email protected]> Gerrit-Reviewer: Dzahn <[email protected]> Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
