diff --git a/attributes/default.rb b/attributes/default.rb index 06a60f52..3aaf95ea 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -25,7 +25,7 @@ 'rpc' => 8400, 'serf_lan' => 8301, 'serf_wan' => 8302, - 'server' => 8300 + 'server' => 8300, } default['consul']['diplomat_version'] = nil @@ -41,5 +41,5 @@ 'AppStderr' => join_path(config_prefix_path, 'error.log'), 'AppRotateFiles' => 1, 'AppRotateOnline' => 1, - 'AppRotateBytes' => 20_000_000 + 'AppRotateBytes' => 20_000_000, } diff --git a/libraries/consul_installation_webui.rb b/libraries/consul_installation_webui.rb index 13419b65..03104117 100644 --- a/libraries/consul_installation_webui.rb +++ b/libraries/consul_installation_webui.rb @@ -39,7 +39,7 @@ def self.default_inversion_options(node, resource) def action_create archive_url = options[:archive_url] % { version: options[:version], - basename: options[:archive_basename] + basename: options[:archive_basename], } notifying_block do diff --git a/libraries/consul_service.rb b/libraries/consul_service.rb index ab53117a..700123d3 100644 --- a/libraries/consul_service.rb +++ b/libraries/consul_service.rb @@ -54,7 +54,7 @@ def command def default_environment { 'GOMAXPROCS' => [node['cpu']['total'], 2].max.to_s, - 'PATH' => '/usr/local/bin:/usr/bin:/bin' + 'PATH' => '/usr/local/bin:/usr/bin:/bin', } end end diff --git a/libraries/helpers.rb b/libraries/helpers.rb index 30d544e6..b8e4c509 100644 --- a/libraries/helpers.rb +++ b/libraries/helpers.rb @@ -123,7 +123,7 @@ def nssm_service_installed? # 1 is command not found # 3 is service not found exit_code = shell_out!(%{"#{nssm_exe}" status consul}, returns: [0, 1, 3]).exitstatus - exit_code == 0 ? true : false + exit_code.zero? ? true : false end def nssm_service_status?(expected_status)