Siebrand has submitted this change and it was merged.
Change subject: Update configuration for email
......................................................................
Update configuration for email
* mailman runs on web1
* just outbound smarthost on es
Change-Id: I719eaaca6f27ca3759a5f060a9fdd54be40f998b
---
A puppet/modules/exim-conf/files/exim4.conf-es
A puppet/modules/exim-conf/files/exim4.conf-web1
A puppet/modules/exim-conf/manifests/es.pp
M puppet/modules/exim-conf/manifests/init.pp
A puppet/modules/exim-conf/manifests/web1.pp
M puppet/modules/mailman-conf/files/exim4/conf.d/transport/40_mailman_pipe
M puppet/modules/mailman-conf/files/nginx/lists.translatewiki.net
M puppet/site.pp
8 files changed, 45 insertions(+), 8 deletions(-)
Approvals:
Siebrand: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/puppet/modules/exim-conf/files/exim4.conf-es
b/puppet/modules/exim-conf/files/exim4.conf-es
new file mode 100644
index 0000000..e0cacae
--- /dev/null
+++ b/puppet/modules/exim-conf/files/exim4.conf-es
@@ -0,0 +1,14 @@
+# file managed by puppet
+dc_eximconfig_configtype='smarthost'
+dc_other_hostnames='translatewiki.net'
+dc_local_interfaces='37.120.188.139;2a03:4000:6:b01f::2;127.0.0.1;::1'
+dc_readhost='translatewiki.net'
+dc_relay_domains=''
+dc_minimaldns='false'
+dc_relay_nets='127.0.0.1;::1;37.120.188.139;2a03:4000:6:b01f::2'
+dc_smarthost='nospam.nichework.com'
+CFILEMODE='644'
+dc_use_split_config='true'
+dc_hide_mailname='true'
+dc_mailname_in_oh='true'
+dc_localdelivery='mail_spool'
diff --git a/puppet/modules/exim-conf/files/exim4.conf-web1
b/puppet/modules/exim-conf/files/exim4.conf-web1
new file mode 100644
index 0000000..8a1c522
--- /dev/null
+++ b/puppet/modules/exim-conf/files/exim4.conf-web1
@@ -0,0 +1,14 @@
+# file managed by puppet
+dc_eximconfig_configtype='smarthost'
+dc_other_hostnames='translatewiki.net;lists.translatewiki.net'
+dc_local_interfaces='37.120.188.137;2a03:4000:6:b01e::2;127.0.0.1;::1'
+dc_readhost='translatewiki.net'
+dc_relay_domains=''
+dc_minimaldns='false'
+dc_relay_nets='127.0.0.1;::1;37.120.188.137;2a03:4000:6:b01e::2'
+dc_smarthost='nospam.nichework.com'
+CFILEMODE='644'
+dc_use_split_config='true'
+dc_hide_mailname='true'
+dc_mailname_in_oh='true'
+dc_localdelivery='mail_spool'
diff --git a/puppet/modules/exim-conf/manifests/es.pp
b/puppet/modules/exim-conf/manifests/es.pp
new file mode 100644
index 0000000..9646518
--- /dev/null
+++ b/puppet/modules/exim-conf/manifests/es.pp
@@ -0,0 +1,5 @@
+class exim-conf::es {
+ class { 'exim':
+ source => 'puppet:///modules/exim-conf/exim4.conf-es'
+ }
+}
diff --git a/puppet/modules/exim-conf/manifests/init.pp
b/puppet/modules/exim-conf/manifests/init.pp
index 87bd66d..66f0457 100644
--- a/puppet/modules/exim-conf/manifests/init.pp
+++ b/puppet/modules/exim-conf/manifests/init.pp
@@ -2,8 +2,4 @@
file { '/etc/mailname':
content => 'translatewiki.net'
}
-
- class { 'exim':
- source => 'puppet:///modules/exim-conf/exim4.conf'
- }
}
diff --git a/puppet/modules/exim-conf/manifests/web1.pp
b/puppet/modules/exim-conf/manifests/web1.pp
new file mode 100644
index 0000000..868d2f3
--- /dev/null
+++ b/puppet/modules/exim-conf/manifests/web1.pp
@@ -0,0 +1,5 @@
+class exim-conf::web1 {
+ class { 'exim':
+ source => 'puppet:///modules/exim-conf/exim4.conf-web1'
+ }
+}
diff --git
a/puppet/modules/mailman-conf/files/exim4/conf.d/transport/40_mailman_pipe
b/puppet/modules/mailman-conf/files/exim4/conf.d/transport/40_mailman_pipe
index 962018f..8afcd34 100644
--- a/puppet/modules/mailman-conf/files/exim4/conf.d/transport/40_mailman_pipe
+++ b/puppet/modules/mailman-conf/files/exim4/conf.d/transport/40_mailman_pipe
@@ -10,4 +10,3 @@
home_directory = MM_HOME
user = MM_UID
group = MM_GID
-
diff --git a/puppet/modules/mailman-conf/files/nginx/lists.translatewiki.net
b/puppet/modules/mailman-conf/files/nginx/lists.translatewiki.net
index 17af6ad..1cc0886 100644
--- a/puppet/modules/mailman-conf/files/nginx/lists.translatewiki.net
+++ b/puppet/modules/mailman-conf/files/nginx/lists.translatewiki.net
@@ -5,7 +5,7 @@
server {
listen 443 ssl spdy;
- listen [2a03:4000:6:55::2]:443 ssl spdy;
+ listen [2a03:4000:6:b01e::2]:443 ssl spdy;
ssl_certificate /etc/ssl/private/translatewiki.net.pem;
ssl_certificate_key /etc/ssl/private/translatewiki.net.key;
diff --git a/puppet/site.pp b/puppet/site.pp
index 1bdf2b9..4a35c9f 100755
--- a/puppet/site.pp
+++ b/puppet/site.pp
@@ -5,8 +5,6 @@
}
node default {
- include exim-conf
- include mailman-conf
include kitano-nl
class { 'backup':
@@ -35,6 +33,10 @@
include memcached
include nginx::sites
+ include exim-conf
+ include exim-conf::web1
+ include mailman-conf
+
sysctl { 'net.ipv4.tcp_window_scaling': value => '1' }
sysctl { 'net.ipv4.tcp_slow_start_after_idle': value => '0' }
sysctl { 'net.ipv4.tcp_fastopen': value => '3' }
@@ -49,5 +51,7 @@
include users
include base::es
+ include exim-conf
+ include exim-conf::web1
include profile::mwelasticsearch
}
--
To view, visit https://gerrit.wikimedia.org/r/226310
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I719eaaca6f27ca3759a5f060a9fdd54be40f998b
Gerrit-PatchSet: 2
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
