diff options
Diffstat (limited to 'manifests')
-rw-r--r-- | manifests/config.pp | 18 | ||||
-rw-r--r-- | manifests/database.pp | 4 | ||||
-rw-r--r-- | manifests/imfile.pp | 4 | ||||
-rw-r--r-- | manifests/params.pp | 39 | ||||
-rw-r--r-- | manifests/snippet.pp | 4 |
5 files changed, 47 insertions, 22 deletions
diff --git a/manifests/config.pp b/manifests/config.pp index d7fbbe6..b3dd641 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -13,8 +13,8 @@ class rsyslog::config { file { $rsyslog::rsyslog_d: ensure => directory, - owner => 'root', - group => $rsyslog::run_group, + owner => 0, + group => 0, purge => $rsyslog::purge_rsyslog_d, recurse => true, force => true, @@ -23,8 +23,8 @@ class rsyslog::config { file { $rsyslog::rsyslog_conf: ensure => file, - owner => 'root', - group => $rsyslog::run_group, + owner => 0, + group => 0, 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 => 'root', - group => $rsyslog::run_group, - source => 'puppet:///modules/rsyslog/rsyslog_default', + owner => 0, + group => 0, + source => "puppet:///modules/rsyslog/${rsyslog::parmas::default_config_file}", require => Class['rsyslog::install'], notify => Class['rsyslog::service'], } file { $rsyslog::spool_dir: ensure => directory, - owner => 'root', - group => $rsyslog::run_group, + owner => 0, + group => 0, require => Class['rsyslog::install'], notify => Class['rsyslog::service'], } diff --git a/manifests/database.pp b/manifests/database.pp index fe6d6ac..09c1cc5 100644 --- a/manifests/database.pp +++ b/manifests/database.pp @@ -46,8 +46,8 @@ class rsyslog::database ( file { $db_conf: ensure => present, - owner => 'root', - group => $rsyslog::run_group, + owner => 0, + group => 0, mode => '0600', content => template("${module_name}/database.conf.erb"), require => Class['rsyslog::config'], diff --git a/manifests/imfile.pp b/manifests/imfile.pp index a6e8216..4a2a2eb 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 => 'root', - group => $rsyslog::run_group, + owner => 0, + group => 0, content => template('rsyslog/imfile.erb'), require => Class['rsyslog::install'], notify => Class['rsyslog::service'], diff --git a/manifests/params.pp b/manifests/params.pp index f5d48cd..644eaa5 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -24,8 +24,7 @@ class rsyslog::params { $purge_rsyslog_d = false $rsyslog_conf = '/etc/rsyslog.conf' $rsyslog_default = '/etc/default/rsyslog' - $run_user = 'root' - $run_group = 'root' + $default_config_file = 'rsyslog_default' $log_user = 'root' $log_group = 'adm' $log_style = 'debian' @@ -57,8 +56,7 @@ class rsyslog::params { $rsyslog_d = '/etc/rsyslog.d/' $rsyslog_conf = '/etc/rsyslog.conf' $rsyslog_default = '/etc/sysconfig/rsyslog' - $run_user = 'root' - $run_group = 'root' + $default_config_file = 'rsyslog_default' $log_user = 'root' $log_group = 'root' $log_style = 'redhat' @@ -85,8 +83,7 @@ class rsyslog::params { $rsyslog_d = '/etc/syslog.d/' $rsyslog_conf = '/etc/syslog.conf' $rsyslog_default = '/etc/defaults/syslogd' - $run_user = 'root' - $run_group = 'wheel' + $default_config_file = 'rsyslog_default' $log_user = 'root' $log_group = 'wheel' $log_style = 'debian' @@ -105,8 +102,36 @@ 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("Unsupported platform: ${::operatingsystem}") + fail("The ${module_name} module is not supported on ${::osfamily}/${::operatingsystem}.") } } } diff --git a/manifests/snippet.pp b/manifests/snippet.pp index bb0468e..6c0a756 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 => $rsyslog::run_user, - group => $rsyslog::run_group, + owner => 0, + group => 0, content => "# file managed by puppet\n${content}\n", require => Class['rsyslog::config'], notify => Class['rsyslog::service'], |