[MediaWiki-commits] [Gerrit] exim: use exim4 directly from role::otrs - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: exim: use exim4 directly from role::otrs
..
exim: use exim4 directly from role::otrs
Avoid the indirection of exim::roled from role::otrs and inline all of
the resources needed.
Change-Id: Iea3cc533a60e569d45bf32cc95bea18444db4d77
---
M manifests/mail.pp
M manifests/role/otrs.pp
2 files changed, 29 insertions(+), 10 deletions(-)
Approvals:
Faidon Liambotis: Verified; Looks good to me, approved
diff --git a/manifests/mail.pp b/manifests/mail.pp
index f7f3fb2..7cc7546 100644
--- a/manifests/mail.pp
+++ b/manifests/mail.pp
@@ -18,7 +18,6 @@
# Internal hostname of the wiki to which verp bounce emails are HTTP
POST-ed and processed
class roled(
$enable_mail_relay=false,
-$enable_otrs_server=false,
$verp_domains=[],
$verp_post_connect_server='',
$verp_bounce_post_url='',
@@ -29,10 +28,7 @@
$otrs_mysql_password = $passwords::exim::otrs_mysql_password
$smtp_ldap_password = $passwords::exim::smtp_ldap_password
-if $enable_otrs_server {
-$config_template = template('exim/exim4.conf.otrs.erb')
-$filter_template = template('exim/system_filter.conf.otrs.erb')
-} elsif $enable_mail_relay {
+if $enable_mail_relay {
$config_template = template('exim/exim4.conf.mx.erb')
$filter_template = template('exim/system_filter.conf.erb')
} else {
diff --git a/manifests/role/otrs.pp b/manifests/role/otrs.pp
index 734c9cc..b28ad60 100644
--- a/manifests/role/otrs.pp
+++ b/manifests/role/otrs.pp
@@ -161,13 +161,36 @@
debug_logging = '--debug spf',
}
-# warning: don't unquote these booleans until exim::roled is fixed
-class { 'exim::roled':
-enable_otrs_server = true,
+include passwords::exim
+$otrs_mysql_password = $passwords::exim::otrs_mysql_password
+
+class { 'exim4':
+variant = 'heavy',
+config = template('exim/exim4.conf.otrs.erb'),
+filter = template('exim/system_filter.conf.erb'),
+require = [
+Class['spamassassin'],
+Class['clamav'],
+]
+}
+include exim4::ganglia
+
+file { '/etc/exim4/defer_domains':
+ensure = present,
+owner = 'root',
+group = 'Debian-exim',
+mode= '0444',
+require = Class['exim4'],
}
-Class['spamassassin'] - Class['exim::roled']
-Class['clamav'] - Class['exim::roled']
+file { '/etc/exim4/wikimedia_domains':
+ensure = present,
+owner = 'root',
+group = 'root',
+mode= '0444',
+source = 'puppet:///files/exim/wikimedia_domains',
+require = Class['exim4'],
+}
cron { 'otrs_train_spamassassin':
ensure = 'present',
--
To view, visit https://gerrit.wikimedia.org/r/216650
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iea3cc533a60e569d45bf32cc95bea18444db4d77
Gerrit-PatchSet: 5
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
[MediaWiki-commits] [Gerrit] exim: use exim4 directly from role::otrs - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/216650
Change subject: exim: use exim4 directly from role::otrs
..
exim: use exim4 directly from role::otrs
Avoid the indirection of exim::roled from role::otrs and inline all of
the resources needed.
Change-Id: Iea3cc533a60e569d45bf32cc95bea18444db4d77
---
M manifests/mail.pp
M manifests/role/otrs.pp
2 files changed, 29 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/50/216650/1
diff --git a/manifests/mail.pp b/manifests/mail.pp
index ab42eef..4ddbecf 100644
--- a/manifests/mail.pp
+++ b/manifests/mail.pp
@@ -18,7 +18,6 @@
# Internal hostname of the wiki to which verp bounce emails are HTTP
POST-ed and processed
class roled(
$enable_mail_relay=false,
-$enable_otrs_server=false,
$verp_domains=[],
$verp_post_connect_server='',
$verp_bounce_post_url='',
@@ -29,10 +28,7 @@
$otrs_mysql_password = $passwords::exim::otrs_mysql_password
$smtp_ldap_password = $passwords::exim::smtp_ldap_password
-if $enable_otrs_server {
-$config_template = template('exim/exim4.conf.otrs.erb')
-$filter_template = template('exim/system_filter.conf.otrs.erb')
-} elsif $enable_mail_relay {
+if $enable_mail_relay {
$config_template = template('exim/exim4.conf.mx.erb')
$filter_template = template('exim/system_filter.conf.erb')
} else {
diff --git a/manifests/role/otrs.pp b/manifests/role/otrs.pp
index 0b1251b..05e3a0c 100644
--- a/manifests/role/otrs.pp
+++ b/manifests/role/otrs.pp
@@ -161,13 +161,36 @@
debug_logging = '--debug spf',
}
-# warning: don't unquote these booleans until exim::roled is fixed
-class { 'exim::roled':
-enable_otrs_server = true,
+include passwords::exim
+$otrs_mysql_password = $passwords::exim::otrs_mysql_password
+
+class { 'exim4':
+variant = 'heavy',
+config = template('exim/exim4.conf.otrs.erb'),
+filter = template('exim/system_filter.conf.erb'),
+require = [
+Class['spamassassin'],
+Class['clamav'],
+]
+}
+include exim4::ganglia
+
+file { '/etc/exim4/defer_domains':
+ensure = present,
+owner = 'root',
+group = 'Debian-exim',
+mode= '0444',
+require = Class['exim4'],
}
-Class['spamassassin'] - Class['exim::roled']
-Class['clamav'] - Class['exim::roled']
+file { '/etc/exim4/wikimedia_domains':
+ensure = present,
+owner = 'root',
+group = 'root',
+mode= '0444',
+source = 'puppet:///files/exim/wikimedia_domains',
+require = Class['exim4'],
+}
cron { 'otrs_train_spamassassin':
ensure = 'present',
--
To view, visit https://gerrit.wikimedia.org/r/216650
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea3cc533a60e569d45bf32cc95bea18444db4d77
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
