Merge pull request #274 from visioncritical/fix-sysvinit-script

Fix Startup Issue
sous-chefs · Feb 7, 2016 · c10d786 · c10d786
2 parents dd51221 + 2709a44
commit c10d786
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -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'

diff --git a/templates/default/sysvinit.service.erb b/templates/default/sysvinit.service.erb
@@ -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

diff --git a/test/spec/libraries/consul_service_windows_spec.rb b/test/spec/libraries/consul_service_windows_spec.rb
@@ -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"""'