Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/138623
Change subject: Revert "Replace exim::simple-mail-sender with a role class"
......................................................................
Revert "Replace exim::simple-mail-sender with a role class"
This class is also assigned by default in labs via ldap, it'll need renaming
there as well not to break puppet in labs.
For reference, these seem to be the default classes in labs ldap:
puppetClass: base
puppetClass: role::labs::instance
puppetClass: exim::simple-mail-sender
puppetClass: sudo::labs_project
This reverts commit 1ad7f49a19b1b48aee75576ee1b7b969bf0bb491.
Change-Id: I7cc91e5589ab9322c74455aa200bfebcee759509
---
M manifests/mail.pp
M manifests/role/mail.pp
M manifests/site.pp
R templates/exim/exim4.minimal.erb
4 files changed, 11 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/23/138623/1
diff --git a/manifests/mail.pp b/manifests/mail.pp
index 81137fd..eaee931 100644
--- a/manifests/mail.pp
+++ b/manifests/mail.pp
@@ -5,6 +5,14 @@
$primary_mx = [ '208.80.152.186',
'2620::860:2:219:b9ff:fedd:c027' ]
}
+
+ class simple-mail-sender {
+ class { 'exim4':
+ queuerunner => 'queueonly',
+ config => template('exim/exim4.minimal.erb'),
+ }
+ }
+
class smtp {
include passwords::exim
$otrs_mysql_password = $passwords::exim::otrs_mysql_password
diff --git a/manifests/role/mail.pp b/manifests/role/mail.pp
index 08cbbc5..40139fd 100644
--- a/manifests/role/mail.pp
+++ b/manifests/role/mail.pp
@@ -1,10 +1,3 @@
-class role::mail::sender {
- class { 'exim4':
- queuerunner => 'queueonly',
- config => template('mail/exim4.minimal.erb'),
- }
-}
-
class role::mail::oldmx {
include backup::client
include privateexim::aliases::private
diff --git a/manifests/site.pp b/manifests/site.pp
index 2022cf0..556d9e0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -39,7 +39,7 @@
include base
include ganglia
include ntp::client
- include role::mail::sender
+ include exim::simple-mail-sender
include role::diamond
}
@@ -936,7 +936,7 @@
include base
include ganglia
- include role::mail::sender
+ include exim::simple-mail-sender
include dns::recursor::statistics
include network::constants
@@ -1500,7 +1500,7 @@
include admin
include base
include ganglia
- include role::mail::sender
+ include exim::simple-mail-sender
include url-downloader
class { 'ntp::server':
diff --git a/templates/mail/exim4.minimal.erb b/templates/exim/exim4.minimal.erb
similarity index 100%
rename from templates/mail/exim4.minimal.erb
rename to templates/exim/exim4.minimal.erb
--
To view, visit https://gerrit.wikimedia.org/r/138623
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7cc91e5589ab9322c74455aa200bfebcee759509
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
