Commit a485de4d authored by Richard Mcleod's avatar Richard Mcleod
Browse files

Tweaks to ensure there are no hardcoded values

parent e78cd633
...@@ -52,8 +52,8 @@ default['rsyslog']['tls_permitted_peer'] = nil ...@@ -52,8 +52,8 @@ default['rsyslog']['tls_permitted_peer'] = nil
default['rsyslog']['use_local_ipv4'] = false default['rsyslog']['use_local_ipv4'] = false
default['rsyslog']['allow_non_local'] = false default['rsyslog']['allow_non_local'] = false
default['rsyslog']['custom_remote'] = [] default['rsyslog']['custom_remote'] = []
default['rsyslog']['additional_directives'] = {} default['rsyslog']['additional_directives'] = {}
default['rsyslog']['templates'] = %w() default['rsyslog']['templates'] = %w()
# The most likely platform-specific attributes # The most likely platform-specific attributes
default['rsyslog']['service_name'] = 'rsyslog' default['rsyslog']['service_name'] = 'rsyslog'
......
...@@ -4,7 +4,7 @@ maintainer_email 'cookbooks@chef.io' ...@@ -4,7 +4,7 @@ maintainer_email 'cookbooks@chef.io'
license 'Apache 2.0' license 'Apache 2.0'
description 'Installs and configures rsyslog' description 'Installs and configures rsyslog'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '5.1.0' version '5.0.2'
recipe 'rsyslog', 'Sets up rsyslog for local logging' recipe 'rsyslog', 'Sets up rsyslog for local logging'
recipe 'rsyslog::client', 'Sets up a client to log to a remote rsyslog server' recipe 'rsyslog::client', 'Sets up a client to log to a remote rsyslog server'
......
...@@ -6,8 +6,6 @@ ...@@ -6,8 +6,6 @@
# /usr/share/doc/rsyslog-doc/html/rsyslog_conf.html # /usr/share/doc/rsyslog-doc/html/rsyslog_conf.html
# #
# Default logging rules can be found in /etc/rsyslog.d/50-default.conf # Default logging rules can be found in /etc/rsyslog.d/50-default.conf
# Umask should be set at the top of the file
$Umask <%= node['rsyslog']['umask']%>
# #
# Set hostname # Set hostname
# #
...@@ -97,6 +95,7 @@ $WorkDirectory <%= node['rsyslog']['working_dir'] %> ...@@ -97,6 +95,7 @@ $WorkDirectory <%= node['rsyslog']['working_dir'] %>
# #
# Set the default permissions for all log files. # Set the default permissions for all log files.
# #
$Umask <%= node['rsyslog']['umask'] %>
$FileOwner <%= node['rsyslog']['user'] %> $FileOwner <%= node['rsyslog']['user'] %>
$FileGroup <%= node['rsyslog']['group'] %> $FileGroup <%= node['rsyslog']['group'] %>
$FileCreateMode <%= node['rsyslog']['file_create_mode'] %> $FileCreateMode <%= node['rsyslog']['file_create_mode'] %>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment