jenkins-bot has submitted this change and it was merged.
Change subject: Add exim-config module
......................................................................
Add exim-config module
Change-Id: I8adab2098f54a1e6a18e178e0c598e582b677c5d
---
A puppet/modules/exim-conf/files/exim4.conf
A puppet/modules/exim-conf/files/mailname
A puppet/modules/exim-conf/manifests/init.pp
M puppet/site.pp
4 files changed, 26 insertions(+), 0 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/exim-conf/files/exim4.conf
b/puppet/modules/exim-conf/files/exim4.conf
new file mode 100644
index 0000000..6fafcce
--- /dev/null
+++ b/puppet/modules/exim-conf/files/exim4.conf
@@ -0,0 +1,15 @@
+# file managed by puppet
+
+dc_eximconfig_configtype='smarthost'
+dc_other_hostnames='translatewiki.net;lists.translatewiki.net'
+dc_local_interfaces='5.45.101.155;127.0.0.1'
+dc_readhost='translatewiki.net'
+dc_relay_domains=''
+dc_minimaldns='false'
+dc_relay_nets='127.0.0.1;5.45.101.155'
+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/mailname
b/puppet/modules/exim-conf/files/mailname
new file mode 100644
index 0000000..3749a79
--- /dev/null
+++ b/puppet/modules/exim-conf/files/mailname
@@ -0,0 +1 @@
+translatewiki.net
diff --git a/puppet/modules/exim-conf/manifests/init.pp
b/puppet/modules/exim-conf/manifests/init.pp
new file mode 100644
index 0000000..5208c06
--- /dev/null
+++ b/puppet/modules/exim-conf/manifests/init.pp
@@ -0,0 +1,9 @@
+class exim-conf {
+ file { '/etc/mailname':
+ source => 'puppet:///modules/exim-conf/mailname'
+ }
+
+ class { 'exim':
+ source => 'puppet:///modules/exim-conf/exim4.conf'
+ }
+}
diff --git a/puppet/site.pp b/puppet/site.pp
index c6d57ff..911c68b 100644
--- a/puppet/site.pp
+++ b/puppet/site.pp
@@ -12,6 +12,7 @@
include sudo
include memcached
include mariadb
+ include exim-conf
package { 'elasticsearch':
provider => dpkg,
--
To view, visit https://gerrit.wikimedia.org/r/91953
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8adab2098f54a1e6a18e178e0c598e582b677c5d
Gerrit-PatchSet: 5
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
