Faidon Liambotis has submitted this change and it was merged.
Change subject: mail: add network::constants include to role class
......................................................................
mail: add network::constants include to role class
role::mail::mx was missing it. Remove it from exim::roled and add it
there instead, for both role::mail::mx and role::mail::lists.
Also cleanup exim4::ganglia includes while at it.
Change-Id: If94178a64fb206091a9467b69ac78da35e3ba253
---
M manifests/mail.pp
M manifests/role/mail.pp
2 files changed, 6 insertions(+), 4 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/mail.pp b/manifests/mail.pp
index 62c9417..9f17477 100644
--- a/manifests/mail.pp
+++ b/manifests/mail.pp
@@ -54,8 +54,8 @@
) {
include exim::smtp
- include network::constants
include privateexim::listserve
+ include exim4::ganglia
class { 'exim4':
variant => 'heavy',
diff --git a/manifests/role/mail.pp b/manifests/role/mail.pp
index 6a6e17c..4fbaa05 100644
--- a/manifests/role/mail.pp
+++ b/manifests/role/mail.pp
@@ -6,8 +6,8 @@
}
class role::mail::mx {
+ include network::constants
include privateexim::aliases::private
- include exim4::ganglia
mailalias { 'root':
recipient => 'r...@wikimedia.org',
@@ -51,15 +51,17 @@
enabled => true,
}
- # FIXME: the rest is unpuppetized so far
-
monitor_service { 'smtp':
description => 'Exim SMTP',
check_command => 'check_smtp',
}
+
+ # FIXME: the rest is unpuppetized so far
}
class role::mail::lists {
+ include network::constants
+
# FIXME: needs to be split to lists/secondarymx
system::role { 'role::mail::lists':
--
To view, visit https://gerrit.wikimedia.org/r/141415
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If94178a64fb206091a9467b69ac78da35e3ba253
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
