[MediaWiki-commits] [Gerrit] Fold exim::rt into role::rt - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/120520
Change subject: Fold exim::rt into role::rt
..
Fold exim::rt into role::rt
exim::rt has currently a single caller, from the role::rt role class.
Moreover, it doesn't make sense to have this logic embedded into the
mail manifest or as an exim subclass and it makes more sense to fold
into the role class, similar to how role::otrs is set up.
Change-Id: I3acb44fc8add7a8d0b083521be04546c96ffb317
---
M manifests/mail.pp
M manifests/role/rt.pp
2 files changed, 13 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/20/120520/1
diff --git a/manifests/mail.pp b/manifests/mail.pp
index 36e534d..79572bc 100644
--- a/manifests/mail.pp
+++ b/manifests/mail.pp
@@ -104,19 +104,6 @@
include exim::service
}
- class rt {
- class { exim::roled:
- local_domains = [ +system_domains, +rt_domains ],
- enable_mail_relay = false,
- enable_external_mail = true,
- smart_route_list = [ mchenry.wikimedia.org,
lists.wikimedia.org ],
- enable_mailman = false,
- rt_relay = true,
- enable_mail_submission = false,
- enable_spamassassin = false
- }
- }
-
class smtp {
include passwords::exim
$otrs_mysql_password = $passwords::exim::otrs_mysql_password
diff --git a/manifests/role/rt.pp b/manifests/role/rt.pp
index 1fbc71b..3336903 100644
--- a/manifests/role/rt.pp
+++ b/manifests/role/rt.pp
@@ -14,7 +14,19 @@
dbpass = $passwords::misc::rt::rt_mysql_pass,
}
- include exim::rt
+ class { 'exim::roled':
+ local_domains = [ '+system_domains', '+rt_domains' ],
+ enable_mail_relay = 'false',
+ enable_external_mail = 'true',
+ smart_route_list = [
+ 'mchenry.wikimedia.org',
+ 'lists.wikimedia.org',
+ ],
+ enable_mailman = 'false',
+ rt_relay = 'true',
+ enable_mail_submission = 'false',
+ enable_spamassassin= 'false',
+ }
}
# Labs/testing RT
--
To view, visit https://gerrit.wikimedia.org/r/120520
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3acb44fc8add7a8d0b083521be04546c96ffb317
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fold exim::rt into role::rt - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: Fold exim::rt into role::rt
..
Fold exim::rt into role::rt
exim::rt has currently a single caller, from the role::rt role class.
Moreover, it doesn't make sense to have this logic embedded into the
mail manifest or as an exim subclass and it makes more sense to fold
into the role class, similar to how role::otrs is set up.
Change-Id: I3acb44fc8add7a8d0b083521be04546c96ffb317
---
M manifests/mail.pp
M manifests/role/rt.pp
2 files changed, 13 insertions(+), 14 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/mail.pp b/manifests/mail.pp
index 36e534d..79572bc 100644
--- a/manifests/mail.pp
+++ b/manifests/mail.pp
@@ -104,19 +104,6 @@
include exim::service
}
- class rt {
- class { exim::roled:
- local_domains = [ +system_domains, +rt_domains ],
- enable_mail_relay = false,
- enable_external_mail = true,
- smart_route_list = [ mchenry.wikimedia.org,
lists.wikimedia.org ],
- enable_mailman = false,
- rt_relay = true,
- enable_mail_submission = false,
- enable_spamassassin = false
- }
- }
-
class smtp {
include passwords::exim
$otrs_mysql_password = $passwords::exim::otrs_mysql_password
diff --git a/manifests/role/rt.pp b/manifests/role/rt.pp
index 1fbc71b..3336903 100644
--- a/manifests/role/rt.pp
+++ b/manifests/role/rt.pp
@@ -14,7 +14,19 @@
dbpass = $passwords::misc::rt::rt_mysql_pass,
}
- include exim::rt
+ class { 'exim::roled':
+ local_domains = [ '+system_domains', '+rt_domains' ],
+ enable_mail_relay = 'false',
+ enable_external_mail = 'true',
+ smart_route_list = [
+ 'mchenry.wikimedia.org',
+ 'lists.wikimedia.org',
+ ],
+ enable_mailman = 'false',
+ rt_relay = 'true',
+ enable_mail_submission = 'false',
+ enable_spamassassin= 'false',
+ }
}
# Labs/testing RT
--
To view, visit https://gerrit.wikimedia.org/r/120520
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3acb44fc8add7a8d0b083521be04546c96ffb317
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
