From 49bda536b0e85079f773f5e0f0fc8e7b807aa960 Mon Sep 17 00:00:00 2001
From: Q <nullfakenull@gmail.com>
Date: Sat, 1 Mar 2014 01:41:07 +0300
Subject: [PATCH] loggly::syslog_ng should check conf.d declaration

loggly::syslog_ng could cause duplicate declaration of /etc/syslog-ng/conf.d
---
 manifests/syslog_ng.pp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/manifests/syslog_ng.pp b/manifests/syslog_ng.pp
index 7c502db..b67123a 100644
--- a/manifests/syslog_ng.pp
+++ b/manifests/syslog_ng.pp
@@ -50,13 +50,14 @@
 
     # Ensure our configuration snippet directory exists before putting
     # configuration snippets there
-    file { '/etc/syslog-ng/conf.d':
-        ensure => 'directory',
-        owner  => 'root',
-        group  => 'root',
-        mode   => '0755',
+    if !defined(File['/etc/syslog-ng/conf.d']){
+      file { '/etc/syslog-ng/conf.d':
+          ensure => 'directory',
+          owner  => 'root',
+          group  => 'root',
+          mode   => '0755',
+      }
     }
-
     # Ensure we are using the correct source name on each distro
     $syslog_source = $::osfamily ? {
         'RedHat' => 's_sys',