Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
mirror
rsyslog
Commits
84b8a3ea
Unverified
Commit
84b8a3ea
authored
Aug 01, 2018
by
Tim Smith
Committed by
GitHub
Aug 01, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #133 from jfwm2/50-default-optional
Optional creation of default configuration file 50-default.conf
parents
551d5239
0ad01e4f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
1 deletion
+3
-1
README.md
README.md
+1
-0
attributes/default.rb
attributes/default.rb
+1
-0
recipes/default.rb
recipes/default.rb
+1
-1
No files found.
README.md
View file @
84b8a3ea
...
...
@@ -72,6 +72,7 @@ See `attributes/default.rb` for default values.
-
`node['rsyslog']['custom_remote']`
- Array of hashes for configuring custom remote server targets
-
`node['rsyslog']['additional_directives']`
- Hash of additional directives and their values to place in the main rsyslog config file
-
`node['rsyslog']['local_host_name']`
- permits to overwrite the system hostname with the one specified in the directive
-
`node['rsyslog']['default_conf_file']`
- If false it skips the creation of default configuration file 50-default.conf
## Recipes
...
...
attributes/default.rb
View file @
84b8a3ea
...
...
@@ -54,6 +54,7 @@ default['rsyslog']['allow_non_local'] = false
default
[
'rsyslog'
][
'custom_remote'
]
=
[]
default
[
'rsyslog'
][
'additional_directives'
]
=
{}
default
[
'rsyslog'
][
'templates'
]
=
%w()
default
[
'rsyslog'
][
'default_conf_file'
]
=
true
# The most likely platform-specific attributes
default
[
'rsyslog'
][
'package_name'
]
=
'rsyslog'
...
...
recipes/default.rb
View file @
84b8a3ea
...
...
@@ -61,7 +61,7 @@ template "#{node['rsyslog']['config_prefix']}/rsyslog.d/50-default.conf" do
mode
node
[
'rsyslog'
][
'config_files'
][
'mode'
]
notifies
:run
,
'execute[validate_config]'
notifies
:restart
,
"service[
#{
node
[
'rsyslog'
][
'service_name'
]
}
]"
end
end
unless
node
[
'rsyslog'
][
'default_conf_file'
]
==
false
# syslog needs to be stopped before rsyslog can be started on RHEL versions before 6.0
if
platform_family?
(
'rhel'
)
&&
node
[
'platform_version'
].
to_i
<
6
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment