From 9a7d3591d4e39e5be5d8612ab519252583f35314 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Thu, 10 Nov 2011 13:51:01 -0500
Subject: add the dovecot-dict-sql.conf to the dovecot::sql class

---
 manifests/sql.pp       | 12 ++++++++++++
 manifests/sql/mysql.pp |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/manifests/sql.pp b/manifests/sql.pp
index 528fd94..67b906e 100644
--- a/manifests/sql.pp
+++ b/manifests/sql.pp
@@ -11,6 +11,17 @@ class dovecot::sql {
     owner => root, group => 0, mode => 0600;
   }
 
+  file { '/etc/dovecot-dict-sql.conf':
+    source => [ "puppet:///modules/site-dovecot/sql/${fqdn}/dovecot-dict-sql.conf",
+                "puppet:///modules/site-dovecot/sql/${dovecot::type}/dovecot-dict-sql.conf",
+                "puppet:///modules/site-dovecot/sql/dovecot-dict-sql.conf",
+                "puppet:///modules/site/sql/${operatingsystem}/dovecot-dict-sql.conf",
+                "puppet:///modules/site/sql/dovecot-dict-sql.conf" ],
+    require => Package['dovecot'],
+    notify => Service['dovecot'],
+    owner => root, group => 0, mode => 0600;
+  }
+
   if $dovecot::mysql {
     include ::dovecot::sql::mysql
   }
@@ -23,5 +34,6 @@ class dovecot::sql {
 
   if $operatingsystem == 'Debian' {
     File['/etc/dovecot-sql.conf'] { path => '/etc/dovecot/dovecot-sql.conf' }
+    File['/etc/dovecot-dict-sql.conf'] { path => '/etc/dovecot/dovecot-dict-sql.conf' }
   }
 }
diff --git a/manifests/sql/mysql.pp b/manifests/sql/mysql.pp
index f4c1a4a..56cbb13 100644
--- a/manifests/sql/mysql.pp
+++ b/manifests/sql/mysql.pp
@@ -3,7 +3,7 @@ class dovecot::sql::mysql {
   if $version == 2 {
     package { 'dovecot-mysql':
       ensure => installed,
-      before => File['/etc/dovecot-sql.conf'],
+      before => [ File['/etc/dovecot-sql.conf'], File['/etc/dovecot-dict-sql.conf'] ];
     }
   }
 }
-- 
cgit v1.2.3