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.

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

Upstart and systemd config files do not need +x permissions #152

Merged
merged 1 commit into from
Apr 2, 2015
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions recipes/_service.rb
Original file line number Diff line number Diff line change
Expand Up @@ -194,20 +194,22 @@
if platform?("ubuntu")
init_file = '/etc/init/consul.conf'
init_tmpl = 'consul.conf.erb'
init_mode = 0644
else
init_file = '/etc/init.d/consul'
init_tmpl = 'consul-init.erb'
init_mode = 0755
end

template node['consul']['etc_config_dir'] do
source 'consul-sysconfig.erb'
mode 0755
mode 0644
notifies :create, "template[#{init_file}]", :immediately
end

template init_file do
source init_tmpl
mode 0755
mode init_mode
notifies :restart, 'service[consul]', :immediately
end

Expand All @@ -234,7 +236,7 @@
when 'systemd'
template '/etc/systemd/system/consul.service' do
source 'consul-systemd.erb'
mode 0755
mode 0644
notifies :restart, 'service[consul]', :immediately
end

Expand Down