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

Fix Startup Issue #274

Merged
merged 3 commits into from
Feb 7, 2016
Merged

Fix Startup Issue #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
77edbce
Changed data_dir attribute value to be dependent on OS
Ginja Feb 5, 2016
5e6c191
Added chkconfig lines for CentOS 5
Ginja Feb 5, 2016
2709a44
Fix spec test
Ginja Feb 6, 2016
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
2 changes: 1 addition & 1 deletion attributes/default.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
default['consul']['config']['bag_item'] = 'consul'

default['consul']['config']['path'] = join_path config_prefix_path, 'consul.json'
default['consul']['config']['data_dir'] = data_prefix_path
default['consul']['config']['data_dir'] = windows? ? join_path(data_prefix_path, 'data') : data_prefix_path
default['consul']['config']['ca_file'] = join_path config_prefix_path, 'ssl', 'CA', 'ca.crt'
default['consul']['config']['cert_file'] = join_path config_prefix_path, 'ssl', 'certs', 'consul.crt'
default['consul']['config']['key_file'] = join_path config_prefix_path, 'ssl', 'private', 'consul.key'
Expand Down
3 changes: 3 additions & 0 deletions templates/default/sysvinit.service.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
#
# <%= @name %> - this script manages the consul agent
#
# chkconfig: 345 99 70
# description: this script manages the consul agent
#
### BEGIN INIT INFO
# Provides: <%= @name %>
# Required-Start: $local_fs $network
Expand Down
2 changes: 1 addition & 1 deletion test/spec/libraries/consul_service_windows_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
recipe 'consul::default'

it { expect(chef_run).to create_directory('C:\Program Files\consul\conf.d') }
it { is_expected.to create_directory('C:\Program Files\consul') }
it { is_expected.to create_directory('C:\Program Files\consul\data') }
it { expect(chef_run).to install_nssm('consul').with(
program: 'C:\Program Files\consul\consul.exe',
args: 'agent -config-file="""C:\Program Files\consul\consul.json""" -config-dir="""C:\Program Files\consul\conf.d"""'
Expand Down