Nemo bis has uploaded a new change for review. https://gerrit.wikimedia.org/r/110524
Change subject: Split exim stats to own class and add it to mchenry ...................................................................... Split exim stats to own class and add it to mchenry Bug: 57890 Change-Id: Ia24fc244c7201e96ff045b88786a895be718dfea --- M manifests/mail.pp M manifests/site.pp 2 files changed, 17 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/24/110524/1 diff --git a/manifests/mail.pp b/manifests/mail.pp index c5c4c25..c716508 100644 --- a/manifests/mail.pp +++ b/manifests/mail.pp @@ -188,11 +188,6 @@ group => Debian-exim, mode => 0444, ensure => present; - "/usr/local/bin/collect_exim_stats_via_gmetric": - owner => root, - group => Debian-exim, - mode => 0755, - source => 'puppet:///files/ganglia/collect_exim_stats_via_gmetric'; } include backup::host @@ -253,12 +248,24 @@ } } - cron { 'collect_exim_stats_via_gmetric': - user => 'root', - command => '/usr/local/bin/collect_exim_stats_via_gmetric', - ensure => present; + class exim::stats { + + file { + owner => root, + group => Debian-exim, + mode => 0755, + source => 'puppet:///files/ganglia/collect_exim_stats_via_gmetric'; + } + + cron { 'collect_exim_stats_via_gmetric': + user => 'root', + command => '/usr/local/bin/collect_exim_stats_via_gmetric', + ensure => present; + } } + include exim::stats + if ( $enable_mailman == "true" ) { include mailman } diff --git a/manifests/site.pp b/manifests/site.pp index c5a534a..1269582 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1556,6 +1556,7 @@ ldap::role::client::corp, backup::client, privateexim::aliases::private, + exim::stats, groups::wikidev, accounts::jdavis -- To view, visit https://gerrit.wikimedia.org/r/110524 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia24fc244c7201e96ff045b88786a895be718dfea Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Nemo bis <federicol...@tiscali.it> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits