Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove dead code #397

Merged
merged 2 commits into from Jan 17, 2017
Merged

Remove dead code #397

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de8fb89
Remove including "chef-sugar"
legal90 Jan 12, 2017
a640bad
Remove undefined attribute from "consul_service"
legal90 Jan 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 2 additions & 5 deletions recipes/default.rb
View file
Open in desktop
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