From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 8 Aug 2010 21:17:13 +0000 (-0300)
Subject: Moving dovecot.conf to a template
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=14578908360176f37b847f0c9bb90d6b6a358032;p=puppet-mail.git

Moving dovecot.conf to a template
---

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
similarity index 99%
rename from files/dovecot/dovecot.conf
rename to 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.