From 0b8473f2a9788f8df69bc94d6c5bfcc5c3b78c56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Wed, 5 Feb 2014 16:26:51 +0100 Subject: Revert "fix run_user and run_group" This reverts commit 4efaf7576dafb701a67052b41b7fa87935dd6db5. --- manifests/init.pp | 4 ++-- templates/rsyslog.conf.erb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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/templates/rsyslog.conf.erb b/templates/rsyslog.conf.erb index 609aa78..f076fc4 100644 --- a/templates/rsyslog.conf.erb +++ b/templates/rsyslog.conf.erb @@ -20,8 +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') %> -$PrivDropToUserID <%= scope.lookupvar('rsyslog::run_user') %> -$PrivDropToGroupID <%= scope.lookupvar('rsyslog::run_group') %> +$PrivDropToUser <%= scope.lookupvar('rsyslog::run_user') %> +$PrivDropToGroup <%= scope.lookupvar('rsyslog::run_group') %> # # Include all config files in <%= scope.lookupvar('rsyslog::rsyslog_d') %> -- cgit v1.2.3 From 6a81a5deb00e4b9b69348fd56fb4477d4a284a98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Wed, 5 Feb 2014 16:31:31 +0100 Subject: Revert "add initial gentoo support" This reverts commit 83c2890c40962cd19b5a402b250a40029f46430b. Conflicts: manifests/config.pp --- files/rsyslog_default_gentoo | 16 ---------------- manifests/config.pp | 18 +++++++++--------- manifests/database.pp | 4 ++-- manifests/imfile.pp | 4 ++-- manifests/params.pp | 39 +++++++-------------------------------- manifests/snippet.pp | 4 ++-- 6 files changed, 22 insertions(+), 63 deletions(-) delete mode 100644 files/rsyslog_default_gentoo diff --git a/files/rsyslog_default_gentoo b/files/rsyslog_default_gentoo deleted file mode 100644 index f5de7b5..0000000 --- a/files/rsyslog_default_gentoo +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/7-stable/rsyslog.confd,v 1.1 2012/11/20 13:03:36 ultrabug Exp $ - -# Configuration file -CONFIGFILE="/etc/rsyslog.conf" - -# PID file -PIDFILE="/var/run/rsyslogd.pid" - -# Options to rsyslogd -# See rsyslogd(8) for more details -# Notes: -# * Do not specify another PIDFILE but use the variable above to change the location -# * Do not specify another CONFIGFILE but use the variable above to change the location -RSYSLOG_OPTS="" 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'], -- cgit v1.2.3 From ac32dffef3d0d9bc7cba8e1d325181773fc1605d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Wed, 5 Feb 2014 16:36:41 +0100 Subject: Add gentoo back --- files/rsyslog_default_gentoo | 16 ++++++++++++++++ manifests/params.pp | 38 ++++++++++++++++++++++++++++++++------ 2 files changed, 48 insertions(+), 6 deletions(-) create mode 100644 files/rsyslog_default_gentoo diff --git a/files/rsyslog_default_gentoo b/files/rsyslog_default_gentoo new file mode 100644 index 0000000..f5de7b5 --- /dev/null +++ b/files/rsyslog_default_gentoo @@ -0,0 +1,16 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/7-stable/rsyslog.confd,v 1.1 2012/11/20 13:03:36 ultrabug Exp $ + +# Configuration file +CONFIGFILE="/etc/rsyslog.conf" + +# PID file +PIDFILE="/var/run/rsyslogd.pid" + +# Options to rsyslogd +# See rsyslogd(8) for more details +# Notes: +# * Do not specify another PIDFILE but use the variable above to change the location +# * Do not specify another CONFIGFILE but use the variable above to change the location +RSYSLOG_OPTS="" diff --git a/manifests/params.pp b/manifests/params.pp index f5d48cd..194d7ca 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -103,13 +103,39 @@ class rsyslog::params { '#$ModLoad immark # provides --MARK-- message capability', ] } + + 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' + $run_user = 'root' + $run_group = 'root' + $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: { - case $::operatingsystem { - default: { - fail("Unsupported platform: ${::operatingsystem}") - } - } + fail("The ${module_name} module is not supported on ${::osfamily}/${::operatingsystem}.") } } - } -- cgit v1.2.3 From 64ffadf9a76b4affe4ba69ab499fcdad1ccd76d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Wed, 5 Feb 2014 16:39:23 +0100 Subject: Add back rsyslog::rsyslog_default_file --- manifests/config.pp | 2 +- manifests/params.pp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/manifests/config.pp b/manifests/config.pp index d7fbbe6..dbb37cc 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -34,7 +34,7 @@ class rsyslog::config { ensure => file, owner => 'root', group => $rsyslog::run_group, - source => 'puppet:///modules/rsyslog/rsyslog_default', + source => "puppet:///modules/rsyslog/${rsyslog::rsyslog_default_file}", require => Class['rsyslog::install'], notify => Class['rsyslog::service'], } diff --git a/manifests/params.pp b/manifests/params.pp index 194d7ca..34544c5 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -24,6 +24,7 @@ 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' @@ -57,6 +58,7 @@ 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' @@ -85,6 +87,7 @@ 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' -- cgit v1.2.3 From b3d6568d99ff3b1779812e032068de99c7780e8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Wed, 5 Feb 2014 16:40:57 +0100 Subject: Use operatingsystem for gentoo --- manifests/params.pp | 66 ++++++++++++++++++++++++++++------------------------- 1 file changed, 35 insertions(+), 31 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index 34544c5..c3fc482 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -107,38 +107,42 @@ class rsyslog::params { ] } - 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' - $run_user = 'root' - $run_group = 'root' - $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}.") + 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' + $run_user = 'root' + $run_group = 'root' + $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}.") + } + } } } } -- cgit v1.2.3