Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/216647
Change subject: exim: remove defer_domains for single-domain MXes
......................................................................
exim: remove defer_domains for single-domain MXes
Not really useful to have a defer domain lists if you're only serving
one domain.
Change-Id: I36ae15da641d347779c6cef7a5ac3a08bbaf2c3d
---
M templates/exim/exim4.conf.mailman.erb
M templates/exim/exim4.conf.phab.erb
M templates/exim/exim4.conf.rt.erb
3 files changed, 0 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/47/216647/1
diff --git a/templates/exim/exim4.conf.mailman.erb
b/templates/exim/exim4.conf.mailman.erb
index 80542f5..f5726c5 100644
--- a/templates/exim/exim4.conf.mailman.erb
+++ b/templates/exim/exim4.conf.mailman.erb
@@ -20,9 +20,6 @@
domainlist system_domains = @
domainlist local_domains = +system_domains : +mailman_domains
-# a list of domains to always respond defer; used for emergencies or planned
downtimes
-domainlist defer_domains = lsearch;CONFDIR/defer_domains
-
# Standard lists
domainlist mailman_domains = lists.wikimedia.org
@@ -102,10 +99,6 @@
require message = Relay not permitted
domains = +local_domains : +relay_domains
set acl_m_relayed = yes
-
- # use this only for emergencies or planned downtimes
- defer message = Administratively set to defer
- domains = +defer_domains
# Accept mail for postmaster without further policy checking,
# for compliance with the RFCs
diff --git a/templates/exim/exim4.conf.phab.erb
b/templates/exim/exim4.conf.phab.erb
index 49fae49..0d52d4f 100644
--- a/templates/exim/exim4.conf.phab.erb
+++ b/templates/exim/exim4.conf.phab.erb
@@ -13,9 +13,6 @@
domainlist system_domains = @
domainlist local_domains = +system_domains : +phab_domains
-# a list of domains to always respond defer; used for emergencies or planned
downtimes
-domainlist defer_domains = lsearch;CONFDIR/defer_domains
-
# Standard lists
domainlist phab_domains = phabricator.wikimedia.org
@@ -88,10 +85,6 @@
require message = Relay not permitted
domains = +local_domains : +relay_domains
set acl_m_relayed = yes
-
- # use this only for emergencies or planned downtimes
- defer message = Administratively set to defer
- domains = +defer_domains
# Accept mail for postmaster without further policy checking,
# for compliance with the RFCs
diff --git a/templates/exim/exim4.conf.rt.erb b/templates/exim/exim4.conf.rt.erb
index 23e8794..5326afb 100644
--- a/templates/exim/exim4.conf.rt.erb
+++ b/templates/exim/exim4.conf.rt.erb
@@ -13,9 +13,6 @@
domainlist system_domains = @
domainlist local_domains = +system_domains : +rt_domains
-# a list of domains to always respond defer; used for emergencies or planned
downtimes
-domainlist defer_domains = lsearch;CONFDIR/defer_domains
-
domainlist rt_domains = rt.wikimedia.org
hostlist wikimedia_nets = <; <%=
scope.lookupvar('network::constants::all_networks').join(" ; ") %>
@@ -87,10 +84,6 @@
require message = Relay not permitted
domains = +local_domains : +relay_domains
set acl_m_relayed = yes
-
- # use this only for emergencies or planned downtimes
- defer message = Administratively set to defer
- domains = +defer_domains
# Accept mail for postmaster without further policy checking,
# for compliance with the RFCs
--
To view, visit https://gerrit.wikimedia.org/r/216647
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I36ae15da641d347779c6cef7a5ac3a08bbaf2c3d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
