diff --git a/libraries/redis_sentinel.rb b/libraries/redis_sentinel.rb index f67ddb3..37dc5a3 100644 --- a/libraries/redis_sentinel.rb +++ b/libraries/redis_sentinel.rb @@ -48,7 +48,7 @@ class RedisSentinel < Chef::Resource attribute(:config_path, kind_of: String, default: '/etc/redis-sentinel.conf') # @!attribute config_mode # @return [String] - attribute(:config_mode, kind_of: String, default: '0440') + attribute(:config_mode, kind_of: String, default: '0740') # @see: https://github.com/antirez/redis/blob/3.2/sentinel.conf attribute(:sentinel_port, kind_of: Integer, default: 26_379) @@ -62,10 +62,10 @@ class RedisSentinel < Chef::Resource attribute(:sentinel_client_reconfig, kind_of: [String, NilClass], default: nil) def default_config_source - if parent.version - "#{parent.version.match(/\d\.\d/).first}/sentinel.conf.erb" + if matches = parent.options.fetch('version', '').match(/\d\.\d/) + "#{matches.first}/sentinel.conf.erb" else - 'sentinel.conf.erb' + '3.2/sentinel.conf.erb' end end end @@ -112,7 +112,7 @@ def action_disable # @api private def service_options(service) - service.command("#{new_resource.program} #{new_resource.config_path}") + service.command("#{new_resource.program} #{new_resource.config_path} --sentinel") service.directory(new_resource.directory) service.user(new_resource.user) end