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(-)

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(-)

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 0440153f0942f4882f6c97a0159ffd5583ab2cd4 Mon Sep 17 00:00:00 2001
From: Maciej Strzelecki <maciej@strzelecki.name>
Date: Mon, 28 Apr 2014 12:53:55 +0200
Subject: update README

---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 79997bf..ef16ddf 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,6 @@ Manage rsyslog client and server via Puppet
         custom_config  => undef,
         server         => 'log',
         port           => '514',
-        preserve_fqdn  => undef,
     }
 ```
 for read from file
@@ -155,7 +154,6 @@ The following lists all the class parameters this module accepts.
     log_auth_local                      true,false          Just log auth facility locally. Defaults to false.
     custom_config                       STRING              Specify your own template to use for client config. Defaults to undef. Example usage: custom_config => 'rsyslog/my_config.erb
     server                              STRING              Rsyslog server to log to. Will be used in the client configuration file.
-    preserve_fqdn                       true,false          Whether or not to preserve the fully qualified domain name when logging.
     log_templates                       HASH                Provides a has defining custom logging templates using the `$template` configuration parameter.
     actionfiletemplate                  STRING              If set this defines the `ActionFileDefaultTemplate` which sets the default logging format for remote and local logging.
 
-- 
cgit v1.2.3


From d0c3c5e014e001f69a36052ae59bdceac025c391 Mon Sep 17 00:00:00 2001
From: Maciej Strzelecki <maciej@strzelecki.name>
Date: Mon, 28 Apr 2014 12:56:20 +0200
Subject: preserve_fqdn in rsyslog namespace

---
 templates/rsyslog.conf.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/rsyslog.conf.erb b/templates/rsyslog.conf.erb
index d289f2a..b65d6a7 100644
--- a/templates/rsyslog.conf.erb
+++ b/templates/rsyslog.conf.erb
@@ -14,7 +14,7 @@
 #
 # Set the default permissions for all log files.
 #
-<% if scope.lookupvar('rsyslog::client::preserve_fqdn') -%>
+<% if scope.lookupvar('rsyslog::preserve_fqdn') -%>
 $PreserveFQDN on
 <% end -%>
 $FileOwner <%= scope.lookupvar('rsyslog::log_user') %>
-- 
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(-)

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