From 6be920d084fe0d768404d71bbe9266757f583c6e Mon Sep 17 00:00:00 2001
From: Derek Tamsen <tamsen@squareup.com>
Date: Tue, 1 Apr 2014 10:36:41 -0700
Subject: Using $rsyslog::server_conf var for server config file name

---
 manifests/params.pp | 8 ++++----
 manifests/server.pp | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 51f5154..5980106 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -35,7 +35,7 @@ class rsyslog::params {
       $spool_dir              = '/var/spool/rsyslog'
       $service_name           = 'rsyslog'
       $client_conf            = 'client'
-      $server_conf            = "${rsyslog_d}server.conf"
+      $server_conf            = 'server'
       $ssl                    = false
       $modules                = [
         '$ModLoad imuxsock # provides support for local system logging',
@@ -72,7 +72,7 @@ class rsyslog::params {
       $spool_dir              = '/var/lib/rsyslog'
       $service_name           = 'rsyslog'
       $client_conf            = 'client'
-      $server_conf            = "${rsyslog_d}server.conf"
+      $server_conf            = 'server'
       $ssl                    = false
       $modules                = [
         '$ModLoad imuxsock # provides support for local system logging',
@@ -101,7 +101,7 @@ class rsyslog::params {
       $spool_dir              = '/var/spool/syslog'
       $service_name           = 'syslogd'
       $client_conf            = 'client'
-      $server_conf            = "${rsyslog_d}server.conf"
+      $server_conf            = 'server'
       $ssl                    = false
       $modules                = [
         '$ModLoad imuxsock # provides support for local system logging',
@@ -134,7 +134,7 @@ class rsyslog::params {
           $spool_dir              = '/var/spool/rsyslog'
           $service_name           = 'rsyslog'
           $client_conf            = 'client'
-          $server_conf            = "${rsyslog_d}server.conf"
+          $server_conf            = 'server'
           $ssl                    = false
           $modules                = [
             '$ModLoad imuxsock # provides support for local system logging',
diff --git a/manifests/server.pp b/manifests/server.pp
index beecde3..0496002 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -46,7 +46,7 @@ class rsyslog::server (
     default => template($custom_config),
   }
 
-  rsyslog::snippet {'server':
+  rsyslog::snippet { $rsyslog::server_conf:
     ensure  => present,
     content => $real_content,
   }
-- 
cgit v1.2.3