Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91953
Change subject: Add exim-config module
......................................................................
Add exim-config module
Change-Id: I8adab2098f54a1e6a18e178e0c598e582b677c5d
---
A puppet/modules/exim-conf/files/mailname
A puppet/modules/exim-conf/files/update-exim4.conf.conf
A puppet/modules/exim-conf/manifests/init.pp
M puppet/site.pp
4 files changed, 44 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/translatewiki
refs/changes/53/91953/1
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/files/update-exim4.conf.conf
b/puppet/modules/exim-conf/files/update-exim4.conf.conf
new file mode 100644
index 0000000..cd0f61a
--- /dev/null
+++ b/puppet/modules/exim-conf/files/update-exim4.conf.conf
@@ -0,0 +1,31 @@
+# /etc/exim4/update-exim4.conf.conf
+#
+# Edit this file and /etc/mailname using puppet and execute update-exim4.conf
+# yourself or use 'dpkg-reconfigure exim4-config'
+#
+# Please note that this is _not_ a dpkg-conffile and that automatic changes
+# to this file might happen. The code handling this will honor your local
+# changes, so this is usually fine, but will break local schemes that mess
+# around with multiple versions of the file.
+#
+# update-exim4.conf uses this file to determine variable values to generate
+# exim configuration macros for the configuration file.
+#
+# Most settings found in here do have corresponding questions in the
+# Debconf configuration, but not all of them.
+#
+# This is a Debian specific file
+
+dc_eximconfig_configtype='smarthost'
+dc_other_hostnames='translatewiki.net;lists.translatewiki.net'
+dc_local_interfaces='185.16.63.116;127.0.0.1'
+dc_readhost='translatewiki.net'
+dc_relay_domains=''
+dc_minimaldns='false'
+dc_relay_nets='127.0.0.1;185.16.63.116'
+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/init.pp
b/puppet/modules/exim-conf/manifests/init.pp
new file mode 100644
index 0000000..72147a2
--- /dev/null
+++ b/puppet/modules/exim-conf/manifests/init.pp
@@ -0,0 +1,11 @@
+class exim-conf {
+ file { '/etc/mailname':
+ source => 'puppet:///modules/exim-config/files/mailname',
+ }
+
+ file { '/etc/exim4/update-exim4.conf.conf':
+ source => 'puppet:///modules/exim-config/files/update-exim4.conf.conf',
+ }
+
+ class { 'exim': }
+}
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: newchange
Gerrit-Change-Id: I8adab2098f54a1e6a18e178e0c598e582b677c5d
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
