From 1890d3562290281450ba6d6552a45caa3a66ba09 Mon Sep 17 00:00:00 2001
From: kwadronaut <kwadronaut@leap.se>
Date: Sun, 23 Mar 2014 03:04:14 +0100
Subject: merge with immerda's syslog option and nadirs latest head fixes #5031
 for LEAP

---
 manifests/base.pp      | 23 +++++++++++++++++++++--
 manifests/deliver.pp   |  7 ++++---
 manifests/init.pp      | 13 +++++++------
 manifests/logrotate.pp |  2 +-
 4 files changed, 33 insertions(+), 12 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,
diff --git a/manifests/deliver.pp b/manifests/deliver.pp
index da190f1..1aa468e 100644
--- a/manifests/deliver.pp
+++ b/manifests/deliver.pp
@@ -1,11 +1,12 @@
 class dovecot::deliver {
 
   include ::dovecot
-
-  file { [ '/var/log/dovecot/deliver.log',
-        '/var/log/dovecot/deliver-error.log' ]:
+  if !$dovecot::use_syslog {
+    file{ [ '/var/log/dovecot/deliver.log',
+            '/var/log/dovecot/deliver-error.log' ]:
       require => Package['dovecot'],
       before => Service['dovecot'],
       owner => root, group => 12, mode => 0660;
+    }
   }
 }
diff --git a/manifests/init.pp b/manifests/init.pp
index 29d6da7..8b6c904 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,12 +1,13 @@
 # we take rpms from fedora
 class dovecot(
-  $type = 'some_unkown_type',
-  $sqlite = false,
-  $pgsql = false,
-  $mysql = false,
+  $type          = 'some_unkown_type',
+  $sqlite        = false,
+  $pgsql         = false,
+  $mysql         = false,
+  $use_syslog    = true,
   $nagios_checks = {
-    'imap-hostname' => $fqdn,
-    'pop3-hostname' => $fqdn,
+    'imap-hostname' => $::fqdn,
+    'pop3-hostname' => $::fqdn,
   },
   $munin_checks = true,
   $manage_shorewall = true,
diff --git a/manifests/logrotate.pp b/manifests/logrotate.pp
index c86f0f0..4282a5a 100644
--- a/manifests/logrotate.pp
+++ b/manifests/logrotate.pp
@@ -1,6 +1,6 @@
 class dovecot::logrotate {
 
-  include logrotate
+  include ::logrotate
 
   augeas {
     "logrotate_dovecot":
-- 
cgit v1.2.3