aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2019-04-11 08:48:49 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2019-04-11 08:48:49 +0200
commit7f97e188740a9d362fe3a1ddf00baef44fdc5748 (patch)
treeee4767d69f8450f4634bae0b3f01bddc4a799fa8
parent2cd20256e34e8a5591da49a368d673a9dc538538 (diff)
parent528b0cf99b8e62789f982970ee3766ec4f54133f (diff)
downloadPuppet-7f97e188740a9d362fe3a1ddf00baef44fdc5748.tar.gz
Puppet-7f97e188740a9d362fe3a1ddf00baef44fdc5748.tar.zst
Puppet-7f97e188740a9d362fe3a1ddf00baef44fdc5748.zip
Merge branch 'dev'
-rw-r--r--modules/profile/manifests/mail.pp1
-rw-r--r--modules/profile/templates/mail/ssmtp.conf.erb2
2 files changed, 2 insertions, 1 deletions
diff --git a/modules/profile/manifests/mail.pp b/modules/profile/manifests/mail.pp
index cc47b77..0b4a7a5 100644
--- a/modules/profile/manifests/mail.pp
+++ b/modules/profile/manifests/mail.pp
@@ -1,6 +1,7 @@
1class profile::mail ( 1class profile::mail (
2 String $mailhub, 2 String $mailhub,
3 Optional[Integer] $mailhub_port = 25, 3 Optional[Integer] $mailhub_port = 25,
4 Optional[String] $default_target = "postmaster",
4) { 5) {
5 ensure_packages(["s-nail", "ssmtp"]) 6 ensure_packages(["s-nail", "ssmtp"])
6 7
diff --git a/modules/profile/templates/mail/ssmtp.conf.erb b/modules/profile/templates/mail/ssmtp.conf.erb
index e7a0410..1766140 100644
--- a/modules/profile/templates/mail/ssmtp.conf.erb
+++ b/modules/profile/templates/mail/ssmtp.conf.erb
@@ -3,7 +3,7 @@
3# 3#
4# The person who gets all mail for userids < 1000 4# The person who gets all mail for userids < 1000
5# Make this empty to disable rewriting. 5# Make this empty to disable rewriting.
6root=postmaster 6root=<%= @default_target %>
7# The place where the mail goes. The actual machine name is required 7# The place where the mail goes. The actual machine name is required
8# no MX records are consulted. Commonly mailhosts are named mail.domain.com 8# no MX records are consulted. Commonly mailhosts are named mail.domain.com
9# The example will fit if you are in domain.com and you mailhub is so named. 9# The example will fit if you are in domain.com and you mailhub is so named.