Skip to content

Commit

Permalink
Merge pull request #397 from legal90/remove-sugar
Browse files Browse the repository at this point in the history
Remove dead code
  • Loading branch information
legal90 committed Jan 17, 2017
2 parents c639a3e + a640bad commit b2fbd5f
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions recipes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
#
# Copyright 2014-2016, Bloomberg Finance L.P.
#
include_recipe 'chef-sugar::default'

node.default['nssm']['install_location'] = '%WINDIR%'

if node['firewall']['allow_consul']
Expand Down Expand Up @@ -33,7 +31,7 @@
poise_service_user node['consul']['service_user'] do
group node['consul']['service_group']
shell node['consul']['service_shell'] unless node['consul']['service_shell'].nil?
not_if { windows? }
not_if { node.platform_family?('windows') }
not_if { node['consul']['service_user'] == 'root' }
not_if { node['consul']['create_service_user'] == false }
notifies :restart, "consul_service[#{service_name}]", :delayed
Expand All @@ -51,11 +49,10 @@
end

consul_service service_name do |r|
version node['consul']['version']
config_file config.path
program install.consul_program

unless windows?
unless node.platform_family?('windows')
user node['consul']['service_user']
group node['consul']['service_group']
end
Expand Down

0 comments on commit b2fbd5f

Please sign in to comment.