syslog: Shuffle the handling of /etc/syslog.conf

The original method of overriding the use of /etc/syslog.conf failed
because of a duplicate declaration of the file resource.  This
restructuring should solve that problem.

manifests/syslog.pp

@@ -4,15 +4,14 @@
 #   for the /var/log/messages log file
 
 class base::syslog {
-  base::syslog::config::syslog { '/etc/syslog.conf': 
-    ensure => present,
-  }
 
   # RHEL4/5 are ancient and use syslog, everything modern uses rsyslog
   if ( $::operatingsystem == 'RedHat' and $::lsbmajdistrelease < 6 ) {
     service { 'syslog': ensure => running }
-  } 
-  else {
+    base::syslog::config::syslog { '/etc/syslog.conf':
+      ensure => present,
+    }
+  } else {
     file { '/etc/rsyslog.d':
       ensure => directory,
       mode   => '0755';
@@ -37,4 +36,4 @@ class base::syslog {
   file { '/etc/filter-syslog/syslog':
     source => 'puppet:///modules/base/syslog/etc/filter-syslog/syslog',
   }
-}
\ No newline at end of file
+}

manifests/syslog/config/rsyslog.pp

@@ -9,11 +9,11 @@ define base::syslog::config::rsyslog(
     $replace         = true,
     $use_syslog_conf = true,
 ) {
-  if $source {
-    $template = undef
+  if $use_syslog_conf {
+    base::syslog::config::syslog {'/etc/syslog.conf':
+      ensure => present,
+    }
   } else {
-    $template = template('base/syslog/rsyslog.conf.erb')
-    if !$use_syslog_conf {
       file {
         '/etc/syslog.conf':
           ensure => absent;
@@ -26,6 +26,12 @@ define base::syslog::config::rsyslog(
       }
     }
   }
+
+  if $source {
+    $template = undef
+  } else {
+    $template = template('base/syslog/rsyslog.conf.erb')
+  }
   file { $name:
     ensure  => $ensure,
     source  => $source,