Merge branch 'master' of https://github.com/saz/puppet-rsyslog into el5

Conflicts:
	templates/rsyslog.conf.erb

11 files changed, 38 insertions, 23 deletions

diff --git a/README.md b/README.md
index 6e46c0e..b9c2468 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,7 @@ Manage rsyslog client and server via Puppet
         custom_config  => undef,
         server         => 'log',
         port           => '514',
+        preserve_fqdn  => undef,
     }
 ```
 for read from file
@@ -88,6 +89,7 @@ The following lists all the class parameters this module accepts.
     server_dir                          STRING              Folder where logs will be stored on the server. Defaults to '/srv/log/'
     custom_config                       STRING              Specify your own template to use for server config. Defaults to undef. Example usage: custom_config => 'rsyslog/my_config.erb'
     high_precision_timestamps           true,false          Whether or not to use high precision timestamps.
+    preserve_fqdn                       true,false          Whether or not to preserve the fully qualified domain name when logging.
 
     RSYSLOG::CLIENT CLASS PARAMETERS    VALUES              DESCRIPTION
     -------------------------------------------------------------------
diff --git a/manifests/client.pp b/manifests/client.pp
index f275ad3..be8518d 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -15,6 +15,7 @@
 # [*server*]
 # [*port*]
 # [*ssl_ca*]
+# [*preserve_fqdn]
 #
 # === Variables
 #
@@ -32,7 +33,8 @@ class rsyslog::client (
   $custom_params  = undef,
   $server         = 'log',
   $port           = '514',
-  $ssl_ca         = undef
+  $ssl_ca         = undef,
+  $preserve_fqdn  = undef
 ) inherits rsyslog {
 
   $content_real = $custom_config ? {
diff --git a/manifests/config.pp b/manifests/config.pp
index ad6e7bd..dbb37cc 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -13,8 +13,8 @@
 class rsyslog::config {
   file { $rsyslog::rsyslog_d:
     ensure  => directory,
-    owner   => 0,
-    group   => 0,
+    owner   => 'root',
+    group   => $rsyslog::run_group,
     purge   => $rsyslog::purge_rsyslog_d,
     recurse => true,
     force   => true,
@@ -23,8 +23,8 @@ class rsyslog::config {
 
   file { $rsyslog::rsyslog_conf:
     ensure  => file,
-    owner   => 0,
-    group   => 0,
+    owner   => 'root',
+    group   => $rsyslog::run_group,
     content => template("${module_name}/rsyslog.conf.erb"),
     require => Class['rsyslog::install'],
     notify  => Class['rsyslog::service'],
@@ -32,8 +32,8 @@ class rsyslog::config {
 
   file { $rsyslog::rsyslog_default:
     ensure  => file,
-    owner   => 0,
-    group   => 0,
+    owner   => 'root',
+    group   => $rsyslog::run_group,
     source  => "puppet:///modules/rsyslog/${rsyslog::rsyslog_default_file}",
     require => Class['rsyslog::install'],
     notify  => Class['rsyslog::service'],
@@ -41,8 +41,8 @@ class rsyslog::config {
 
   file { $rsyslog::spool_dir:
     ensure  => directory,
-    owner   => 0,
-    group   => 0,
+    owner   => 'root',
+    group   => $rsyslog::run_group,
     require => Class['rsyslog::install'],
     notify  => Class['rsyslog::service'],
   }
diff --git a/manifests/database.pp b/manifests/database.pp
index 09c1cc5..fe6d6ac 100644
--- a/manifests/database.pp
+++ b/manifests/database.pp
@@ -46,8 +46,8 @@ class rsyslog::database (
 
   file { $db_conf:
     ensure  => present,
-    owner   => 0,
-    group   => 0,
+    owner   => 'root',
+    group   => $rsyslog::run_group,
     mode    => '0600',
     content => template("${module_name}/database.conf.erb"),
     require => Class['rsyslog::config'],
diff --git a/manifests/imfile.pp b/manifests/imfile.pp
index 4a2a2eb..a6e8216 100644
--- a/manifests/imfile.pp
+++ b/manifests/imfile.pp
@@ -34,8 +34,8 @@ define rsyslog::imfile(
 
   file { "${rsyslog::rsyslog_d}${name}.conf":
     ensure  => file,
-    owner   => 0,
-    group   => 0,
+    owner   => 'root',
+    group   => $rsyslog::run_group,
     content => template('rsyslog/imfile.erb'),
     require => Class['rsyslog::install'],
     notify  => Class['rsyslog::service'],
diff --git a/manifests/init.pp b/manifests/init.pp
index e4692ba..fbe22f6 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -11,8 +11,6 @@
 #  class { 'rsyslog': }
 #
 class rsyslog (
-  $run_user               = 0,
-  $run_group              = 0,
   $rsyslog_package_name   = $rsyslog::params::rsyslog_package_name,
   $relp_package_name      = $rsyslog::params::relp_package_name,
   $mysql_package_name     = $rsyslog::params::mysql_package_name,
@@ -24,6 +22,8 @@ class rsyslog (
   $rsyslog_conf           = $rsyslog::params::rsyslog_conf,
   $rsyslog_default        = $rsyslog::params::rsyslog_default,
   $rsyslog_default_file   = $rsyslog::params::default_config_file,
+  $run_user               = $rsyslog::params::run_user,
+  $run_group              = $rsyslog::params::run_group,
   $log_user               = $rsyslog::params::log_user,
   $log_group              = $rsyslog::params::log_group,
   $log_style              = $rsyslog::params::log_style,
diff --git a/manifests/params.pp b/manifests/params.pp
index e7f3859..5bf75cf 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -25,6 +25,8 @@ class rsyslog::params {
       $rsyslog_conf           = '/etc/rsyslog.conf'
       $rsyslog_default        = '/etc/default/rsyslog'
       $default_config_file    = 'rsyslog_default'
+      $run_user               = 'root'
+      $run_group              = 'root'
       $log_user               = 'root'
       $log_group              = 'adm'
       $log_style              = 'debian'
@@ -60,6 +62,8 @@ class rsyslog::params {
       $rsyslog_conf           = '/etc/rsyslog.conf'
       $rsyslog_default        = '/etc/sysconfig/rsyslog'
       $default_config_file    = 'rsyslog_default'
+      $run_user               = 'root'
+      $run_group              = 'root'
       $log_user               = 'root'
       $log_group              = 'root'
       $log_style              = 'redhat'
@@ -87,6 +91,8 @@ class rsyslog::params {
       $rsyslog_conf           = '/etc/syslog.conf'
       $rsyslog_default        = '/etc/defaults/syslogd'
       $default_config_file    = 'rsyslog_default'
+      $run_user               = 'root'
+      $run_group              = 'wheel'
       $log_user               = 'root'
       $log_group              = 'wheel'
       $log_style              = 'debian'
@@ -103,6 +109,7 @@ class rsyslog::params {
         '#$ModLoad immark  # provides --MARK-- message capability',
       ]
     }
+
     default: {
       case $::operatingsystem {
         gentoo: {
@@ -117,6 +124,8 @@ class rsyslog::params {
           $rsyslog_conf           = '/etc/rsyslog.conf'
           $rsyslog_default        = '/etc/conf.d/rsyslog'
           $default_config_file    = 'rsyslog_default_gentoo'
+          $run_user               = 'root'
+          $run_group              = 'root'
           $log_user               = 'root'
           $log_group              = 'adm'
           $log_style              = 'debian'
@@ -139,5 +148,4 @@ class rsyslog::params {
       }
     }
   }
-
 }
diff --git a/manifests/snippet.pp b/manifests/snippet.pp
index 6c0a756..bb0468e 100644
--- a/manifests/snippet.pp
+++ b/manifests/snippet.pp
@@ -24,8 +24,8 @@ define rsyslog::snippet(
 
   file { "${rsyslog::rsyslog_d}${name}.conf":
     ensure  => $ensure,
-    owner   => 0,
-    group   => 0,
+    owner   => $rsyslog::run_user,
+    group   => $rsyslog::run_group,
     content => "# file managed by puppet\n${content}\n",
     require => Class['rsyslog::config'],
     notify  => Class['rsyslog::service'],
diff --git a/templates/client.conf.erb b/templates/client.conf.erb
index d86a271..696b9b2 100644
--- a/templates/client.conf.erb
+++ b/templates/client.conf.erb
@@ -41,6 +41,11 @@ auth,authpriv.*                 /var/log/secure
 <% end -%>
 <% end -%>
 
+<% if scope.lookupvar('rsyslog::client::preserve_fqdn') -%>
+# Tell rsyslog to use FQDN and not short server names
+$PreserveFQDN on 
+<% end -%>
+
 <% if scope.lookupvar('rsyslog::client::log_local') -%>
 <% if scope.lookupvar('rsyslog::log_style') == 'debian' -%>
 # First some standard log files.  Log by facility.
diff --git a/templates/imfile.erb b/templates/imfile.erb
index 0540158..4e5b71f 100644
--- a/templates/imfile.erb
+++ b/templates/imfile.erb
@@ -6,6 +6,6 @@ $InputFileStateFile state-<%= @name %>
 $InputFileSeverity <%= @file_severity %>
 $InputFileFacility <%= @file_facility %>
 $InputFilePollInterval <%= @polling_interval %>
-<% if run_file_monitor == true -%>
+<% if @run_file_monitor == true -%>
 $InputRunFileMonitor
 <% end -%>
diff --git a/templates/rsyslog.conf.erb b/templates/rsyslog.conf.erb
index da7920f..f076fc4 100644
--- a/templates/rsyslog.conf.erb
+++ b/templates/rsyslog.conf.erb
@@ -20,10 +20,8 @@ $FileCreateMode <%= scope.lookupvar('rsyslog::perm_file') %>
 $DirOwner <%= scope.lookupvar('rsyslog::log_user') %>
 $DirGroup <%= scope.lookupvar('rsyslog::log_group') %>
 $DirCreateMode <%= scope.lookupvar('rsyslog::perm_dir') %>
-<% if scope.lookupvar('osfamily') == 'redhat' and scope.lookupvar('operatingsystemrelease') >= 6.0 -%>
-$PrivDropToUserID <%= scope.lookupvar('rsyslog::run_user') %>
-$PrivDropToGroupID <%= scope.lookupvar('rsyslog::run_group') %>
-<% end -%>
+$PrivDropToUser <%= scope.lookupvar('rsyslog::run_user') %>
+$PrivDropToGroup <%= scope.lookupvar('rsyslog::run_group') %>
 
 #
 # Include all config files in <%= scope.lookupvar('rsyslog::rsyslog_d') %>