diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2010-08-08 18:17:13 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2010-08-08 18:17:13 -0300 |
| commit | 14578908360176f37b847f0c9bb90d6b6a358032 (patch) | |
| tree | 1211da8c8e442326c2dc32bee9fb788cd9ab5b9c | |
| parent | 05f35dc96c80a7039c3e015f02ad61f83e3008d4 (diff) | |
| download | puppet-mail-14578908360176f37b847f0c9bb90d6b6a358032.tar.gz puppet-mail-14578908360176f37b847f0c9bb90d6b6a358032.tar.bz2 | |
Moving dovecot.conf to a template
| -rw-r--r-- | manifests/dovecot.pp | 12 | ||||
| -rw-r--r-- | templates/dovecot/dovecot.conf.erb (renamed from files/dovecot/dovecot.conf) | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/manifests/dovecot.pp b/manifests/dovecot.pp index 0ced8e1..20364fe 100644 --- a/manifests/dovecot.pp +++ b/manifests/dovecot.pp @@ -6,12 +6,12 @@ class mail::dovecot { } file { "/etc/dovecot/dovecot.conf": - ensure => present, - owner => root, - group => vmail, - mode => 0644, - source => "puppet://$server/modules/mail/dovecot/dovecot.conf", - notify => Service['dovecot'], + ensure => present, + owner => root, + group => vmail, + mode => 0644, + content => template('mail/dovecot/dovecot.conf.erb'), + notify => Service['dovecot'], } file { "/etc/dovecot/dovecot-sql.conf": diff --git a/files/dovecot/dovecot.conf b/templates/dovecot/dovecot.conf.erb index 19750bf..0da5182 100644 --- a/files/dovecot/dovecot.conf +++ b/templates/dovecot/dovecot.conf.erb @@ -709,7 +709,7 @@ protocol managesieve { protocol lda { # Address to use when sending rejection mails. - # postmaster_address = postmaster@example.com + postmaster_address = postmaster@<%= fqdn %> # Hostname to use in various parts of sent mails, eg. in Message-Id. # Default is the system's real hostname. |