merge with immerda's syslog option and nadirs latest head fixes #5031

for LEAP

1 files changed, 21 insertions, 2 deletions

diff --git a/manifests/base.pp b/manifests/base.pp
index 2b00cff..ffdd510 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -21,6 +21,27 @@ class dovecot::base {
     mode    => '0755';
   }
 
+  if !$dovecot::use_syslog {
+    file{
+      '/var/log/dovecot':
+        ensure  => directory,
+        require => Package['dovecot'],
+        before  => Service['dovecot'],
+        owner   => dovecot,
+        group   => $dovecot::shared_group,
+        mode    => '0660';
+      [ '/var/log/dovecot/error.log',
+        '/var/log/dovecot/infos.log' ]:
+        require => Package['dovecot'],
+        before  => Service['dovecot'],
+        owner   => root,
+        group   => $dovecot::shared_group,
+        mode    => '0660';
+    }
+
+    include dovecot::logrotate
+  }
+
   file {
     '/var/log/dovecot':
       ensure  => directory,
@@ -44,8 +65,6 @@ class dovecot::base {
     alias  => 'dovecot'
   }
 
-  include dovecot::logrotate
-
   service{'dovecot':
     ensure => running,
     enable => true,