From 3f7952a099dfb65d7048b7448002d288a846f85b Mon Sep 17 00:00:00 2001
From: Maciej Strzelecki <maciej@strzelecki.name>
Date: Mon, 28 Apr 2014 12:53:20 +0200
Subject: remove preserve_fqdn from rsyslog::client

---
 manifests/client.pp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'manifests')

diff --git a/manifests/client.pp b/manifests/client.pp
index 3cccff3..4028b11 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -38,8 +38,7 @@ class rsyslog::client (
   $remote_servers     = false,
   $ssl_ca             = undef,
   $log_templates      = false,
-  $actionfiletemplate = false,
-  $preserve_fqdn      = false
+  $actionfiletemplate = false
 ) inherits rsyslog {
 
   $content_real = $custom_config ? {
-- 
cgit v1.2.3


From 94a71f9ed17bd6a8ac26312ca00d59633b41f04f Mon Sep 17 00:00:00 2001
From: Maciej Strzelecki <maciej@strzelecki.name>
Date: Mon, 28 Apr 2014 12:53:37 +0200
Subject: preserve_fqdn in rsyslog class

---
 manifests/init.pp   | 3 ++-
 manifests/params.pp | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'manifests')

diff --git a/manifests/init.pp b/manifests/init.pp
index fbe22f6..ec988f5 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -34,7 +34,8 @@ class rsyslog (
   $client_conf            = $rsyslog::params::client_conf,
   $server_conf            = $rsyslog::params::server_conf,
   $ssl                    = $rsyslog::params::ssl,
-  $modules                = $rsyslog::params::modules
+  $modules                = $rsyslog::params::modules,
+  $preserve_fqdn          = $rsyslog::params::preserve_fqdn
 ) inherits rsyslog::params {
   class { 'rsyslog::install': }
   class { 'rsyslog::config': }
diff --git a/manifests/params.pp b/manifests/params.pp
index 5bf75cf..d326691 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -41,7 +41,8 @@ class rsyslog::params {
         '$ModLoad imuxsock # provides support for local system logging',
         '$ModLoad imklog   # provides kernel logging support (previously done by rklogd)',
         '#$ModLoad immark  # provides --MARK-- message capability',
-      ]
+      ],
+      $preserve_fqdn          = false
     }
     redhat: {
       if $::operatingsystemrelease >= 6.0 {
-- 
cgit v1.2.3


From 5fd2b5f6e91964989fa8828cb309f35aed5056c7 Mon Sep 17 00:00:00 2001
From: Maciej Strzelecki <maciej@strzelecki.name>
Date: Mon, 28 Apr 2014 13:08:43 +0200
Subject: fix typo in variables list

---
 manifests/params.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'manifests')

diff --git a/manifests/params.pp b/manifests/params.pp
index d326691..c1d2f71 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -41,7 +41,7 @@ class rsyslog::params {
         '$ModLoad imuxsock # provides support for local system logging',
         '$ModLoad imklog   # provides kernel logging support (previously done by rklogd)',
         '#$ModLoad immark  # provides --MARK-- message capability',
-      ],
+      ]
       $preserve_fqdn          = false
     }
     redhat: {
-- 
cgit v1.2.3