Revert "add initial gentoo support"

This reverts commit 83c2890c40962cd19b5a402b250a40029f46430b.

Conflicts:
	manifests/config.pp

5 files changed, 22 insertions, 47 deletions

diff --git a/manifests/config.pp b/manifests/config.pp
index ad6e7bd..d7fbbe6 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,17 +32,17 @@ class rsyslog::config {
 
   file { $rsyslog::rsyslog_default:
     ensure  => file,
-    owner   => 0,
-    group   => 0,
-    source  => "puppet:///modules/rsyslog/${rsyslog::rsyslog_default_file}",
+    owner   => 'root',
+    group   => $rsyslog::run_group,
+    source  => 'puppet:///modules/rsyslog/rsyslog_default',
     require => Class['rsyslog::install'],
     notify  => Class['rsyslog::service'],
   }
 
   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/params.pp b/manifests/params.pp
index 644eaa5..f5d48cd 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -24,7 +24,8 @@ class rsyslog::params {
       $purge_rsyslog_d        = false
       $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'
@@ -56,7 +57,8 @@ class rsyslog::params {
       $rsyslog_d              = '/etc/rsyslog.d/'
       $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'
@@ -83,7 +85,8 @@ class rsyslog::params {
       $rsyslog_d              = '/etc/syslog.d/'
       $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'
@@ -102,36 +105,8 @@ class rsyslog::params {
     }
     default: {
       case $::operatingsystem {
-        gentoo: {
-          $rsyslog_package_name   = 'app-admin/rsyslog'
-          $relp_package_name      = false
-          $mysql_package_name     = 'rsyslog-mysql'
-          $pgsql_package_name     = 'rsyslog-pgsql'
-          $gnutls_package_name    = false
-          $package_status         = 'latest'
-          $rsyslog_d              = '/etc/rsyslog.d/'
-          $purge_rsyslog_d        = false
-          $rsyslog_conf           = '/etc/rsyslog.conf'
-          $rsyslog_default        = '/etc/conf.d/rsyslog'
-          $default_config_file    = 'rsyslog_default_gentoo'
-          $log_user               = 'root'
-          $log_group              = 'adm'
-          $log_style              = 'debian'
-          $perm_file              = '0640'
-          $perm_dir               = '0755'
-          $spool_dir              = '/var/spool/rsyslog'
-          $service_name           = 'rsyslog'
-          $client_conf            = "${rsyslog_d}client.conf"
-          $server_conf            = "${rsyslog_d}server.conf"
-          $ssl                    = false
-          $modules                = [
-            '$ModLoad imuxsock # provides support for local system logging',
-            '$ModLoad imklog   # provides kernel logging support (previously done by rklogd)',
-            '#$ModLoad immark  # provides --MARK-- message capability',
-          ]
-        }
         default: {
-          fail("The ${module_name} module is not supported on ${::osfamily}/${::operatingsystem}.")
+          fail("Unsupported platform: ${::operatingsystem}")
         }
       }
     }
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'],