Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: whopper/puppet-rsyslog
base: 482623e806
...
head fork: whopper/puppet-rsyslog
compare: ea2c5dbe7f
  • 2 commits
  • 6 files changed
  • 1 commit comment
  • 1 contributor
View
22 manifests/client.pp
@@ -7,15 +7,15 @@
$server = 'log'
) inherits rsyslog {
- file { $rsyslog::params::client_conf:
- ensure => present,
- owner => root,
- group => root,
- content => $custom_config ? {
- '' => template("${module_name}/client.conf.erb"),
- default => template($custom_config),
- },
- require => Class['rsyslog::config'],
- notify => Class['rsyslog::service'],
- }
+ file { $rsyslog::params::client_conf:
+ ensure => present,
+ owner => root,
+ group => $rsyslog::params::run_group,
+ content => $custom_config ? {
+ '' => template("${module_name}/client.conf.erb"),
+ default => template($custom_config),
+ },
+ require => Class['rsyslog::config'],
+ notify => Class['rsyslog::service'],
+ }
}
View
8 manifests/config.pp
@@ -1,7 +1,7 @@
class rsyslog::config {
file { $rsyslog::params::rsyslog_d:
owner => root,
- group => root,
+ group => $rsyslog::params::run_group,
purge => true,
recurse => true,
force => true,
@@ -11,7 +11,7 @@
file { $rsyslog::params::rsyslog_conf:
owner => root,
- group => root,
+ group => $rsyslog::params::run_group,
ensure => file,
content => template("${module_name}/rsyslog.conf.erb"),
require => Class["rsyslog::install"],
@@ -20,7 +20,7 @@
file { $rsyslog::params::rsyslog_default:
owner => root,
- group => root,
+ group => $rsyslog::params::run_group,
ensure => file,
source => "puppet:///modules/rsyslog/rsyslog_default",
require => Class["rsyslog::install"],
@@ -29,7 +29,7 @@
file { $rsyslog::params::spool_dir:
owner => root,
- group => root,
+ group => $rsyslog::params::run_group,
ensure => directory,
require => Class["rsyslog::install"],
notify => Class["rsyslog::service"],
View
2  manifests/imfile.pp
@@ -11,7 +11,7 @@
file { "${rsyslog::params::rsyslog_d}${name}.conf":
ensure => file,
owner => 'root',
- group => 'root',
+ group => $rsyslog::params::run_group,
content => template('rsyslog/imfile.erb'),
require => Class['rsyslog::install'],
notify => Class['rsyslog::service'],
View
4 manifests/install.pp
@@ -1,9 +1,9 @@
class rsyslog::install {
package { $rsyslog::params::rsyslog_package_name:
- ensure => latest,
+ ensure => $rsyslog::params::package_status,
}
package { $rsyslog::params::relp_package_name:
- ensure => latest,
+ ensure => $rsyslog::params::package_status
}
}
View
34 manifests/params.pp
@@ -3,28 +3,40 @@
ubuntu, debian: {
$rsyslog_package_name = 'rsyslog'
$relp_package_name = 'rsyslog-relp'
+ $package_status = 'latest'
$rsyslog_d = '/etc/rsyslog.d/'
$rsyslog_conf = '/etc/rsyslog.conf'
$rsyslog_default = '/etc/default/rsyslog'
+ $run_user = 'root'
+ $run_group = 'root'
+ $log_user = 'root'
+ $log_group = 'adm'
$spool_dir = '/var/spool/rsyslog/'
$service_name = 'rsyslog'
$client_conf = "${rsyslog_d}client.conf"
$server_conf = "${rsyslog_d}server.conf"
}
+ freebsd: {
+ $rsyslog_package_name = 'rsyslog5'
+ $relp_package_name = 'rsyslog5-relp'
+ $package_status = 'present'
+ $rsyslog_d = '/etc/syslog.d/'
+ $rsyslog_conf = '/etc/syslog.conf'
+ $rsyslog_default = '/etc/defaults/syslogd'
+ $run_user = 'root'
+ $run_group = 'wheel'
+ $log_user = 'root'
+ $log_group = 'wheel'
+ $spool_dir = '/var/spool/syslog/'
+ $service_name = 'syslogd'
+ $client_conf = "${rsyslog_d}client.conf"
+ $server_conf = "${rsyslog_d}server.conf"
+ }
+
+
default: {
fail("Unsupported platform: ${::operatingsystem}")
}
}
- #
- # Internal variables
- #
-
- # Drop privileges to this user and group
- $run_user = 'root'
- $run_group = 'root'
-
- # User and group of log files
- $log_user = 'root'
- $log_group = 'adm'
}
View
2  manifests/server.pp
@@ -9,7 +9,7 @@
file { $rsyslog::params::server_conf:
ensure => present,
owner => root,
- group => root,
+ group => $rsyslog::params::run_group,
content => $custom_config ? {
'' => template("${module_name}/server.conf.erb"),
default => template($custom_config),

Showing you all comments on commits in this comparison.

@whopper
Owner

Alright, I believe everything is cleaner now. Let me know if there's anything else I can fix. Thanks!

Something went wrong with that request. Please try again.