Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
mirror
rsyslog
Commits
38058d5e
Commit
38058d5e
authored
Nov 09, 2015
by
Tim Smith
Browse files
Fix converges
parent
c696b7d2
Changes
2
Hide whitespace changes
Inline
Side-by-side
libraries/helpers.rb
View file @
38058d5e
module
RsyslogCookbook
# helpers for the various service providers on Ubuntu systems
module
Helpers
# use the correct provider based on the Ubuntu release
def
find_provider
if
Chef
::
VersionConstraint
.
new
(
'>= 15.04'
).
include?
(
node
[
'platform_version'
])
service_provider
=
Chef
::
Provider
::
Service
::
Systemd
...
...
@@ -11,5 +12,16 @@ module RsyslogCookbook
end
service_provider
end
# declare the service with the appropriate provider if on Ubuntu
def
declare_rsyslog_service
service_provider
=
'ubuntu'
==
node
[
'platform'
]
?
find_provider
:
nil
service
node
[
'rsyslog'
][
'service_name'
]
do
supports
restart:
true
,
status:
true
action
[
:enable
,
:start
]
provider
service_provider
end
end
end
end
resources/file_input.rb
View file @
38058d5e
...
...
@@ -29,13 +29,7 @@ property :source, kind_of: String, default: 'file-input.conf.erb'
include
RsyslogCookbook
::
Helpers
action
:create
do
service_provider
=
'ubuntu'
==
node
[
'platform'
]
?
find_provider
:
nil
service
node
[
'rsyslog'
][
'service_name'
]
do
supports
restart:
true
,
status:
true
action
[
:enable
,
:start
]
provider
service_provider
end
declare_rsyslog_service
template
"/etc/rsyslog.d/
#{
new_resource
.
priority
}
-
#{
new_resource
.
name
}
.conf"
do
mode
'0664'
...
...
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