Alexandros Kosiaris has submitted this change and it was merged.
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, 18 insertions(+), 10 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/mail.pp b/manifests/mail.pp
index 0aa8ea9..36e534d 100644
--- a/manifests/mail.pp
+++ b/manifests/mail.pp
@@ -5,6 +5,22 @@
$primary_mx = [ "208.80.152.186",
"2620::860:2:219:b9ff:fedd:c027" ]
}
+ class stats {
+
+ file { '/usr/local/bin/collect_exim_stats_via_gmetric':
+ 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;
+ }
+ }
+
class config($install_type="light", $queuerunner="queueonly") {
package { [ "exim4-config", "exim4-daemon-${install_type}" ]:
ensure => latest }
@@ -188,11 +204,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,11 +264,7 @@
}
}
- 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 dfe180f..64ffbba 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1544,6 +1544,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: merged
Gerrit-Change-Id: Ia24fc244c7201e96ff045b88786a895be718dfea
Gerrit-PatchSet: 7
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Nemo bis <federicol...@tiscali.it>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Matanya <mata...@foss.co.il>
Gerrit-Reviewer: Nemo bis <federicol...@tiscali.it>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
