From 38dd36690facdae1c1ca9c89bcfc6be18c2e1a66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20M=E4kinen?= <tmakinen@foo.sh>
Date: Mon, 14 May 2012 01:18:13 +0300
Subject: [PATCH] Fixed declaration errors when syslog::client and
 syslog::server are included to same node.

---
 syslog/manifests/init.pp | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/syslog/manifests/init.pp b/syslog/manifests/init.pp
index 76d75f0..36c8331 100644
--- a/syslog/manifests/init.pp
+++ b/syslog/manifests/init.pp
@@ -55,6 +55,13 @@ class syslog::common {
         }
     }
 
+    file { "/var/log/all.log":
+        ensure => present,
+        mode   => "0640",
+        owner  => "root",
+        group  => $group,
+    }
+
 }
 
 # Install syslog client
@@ -90,14 +97,6 @@ class syslog::client::syslogd {
         }
     }
 
-    file { "/var/log/all.log":
-        ensure => present,
-        mode   => "0640",
-        owner  => "root",
-        group  => $group,
-        notify => Service["syslogd"],
-    }
-
     file { "/etc/syslog.conf":
         ensure  => present,
         content => template("syslog/syslog.conf.$operatingsystem.erb",
@@ -126,6 +125,7 @@ class syslog::client::syslogd {
             "openbsd" => "pkill -HUP -u _syslogd",
             default   => undef,
         },
+        require => File["/var/log/all.log"],
     }
 
 }
@@ -162,15 +162,16 @@ class syslog::client::rsyslog {
     }
 
     service { "rsyslog":
-        ensure => running,
-        enable => true,
-        start  => $operatingsystem ? {
+        ensure  => running,
+        enable  => true,
+        start   => $operatingsystem ? {
             "openbsd" => $operatingsystemrelease ? {
                 /4\.[1-8]/ => "pkill syslogd; /usr/local/sbin/rsyslogd -c 4 -x -i /var/run/syslog.pid",
                 default    => undef,
             },
             default   => undef,
         },
+        require => File["/var/log/all.log"],
     }
 
     if $operatingsystem == "OpenBSD" and $operatingsystemrelease !~ /4\.[1-8]/ {
@@ -234,7 +235,7 @@ class syslog::common::standalone inherits syslog::common {
         require => File["/srv/log"],
     }
 
-    file { "/var/log/all.log":
+    File["/var/log/all.log"] {
         ensure => link,
         target => "/srv/log/all.log",
     }