Merge pull request #35 from webcoyote/fix_runit

Fix runit initialization on new server
sous-chefs · Aug 19, 2014 · e10b7cb · e10b7cb
2 parents 399a722 + ad8bc89
commit e10b7cb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/.kitchen.yml b/.kitchen.yml
@@ -26,6 +26,13 @@ suites:
     attributes:
       consul:
           datacenter: FortMeade
+  - name: runit
+    run_list:
+      - recipe[consul::default]
+    attributes:
+      consul:
+          datacenter: FortMeade
+          init_style: runit
   - name: ui
     run_list:
       - recipe[consul::default]

diff --git a/recipes/_service.rb b/recipes/_service.rb
@@ -25,6 +25,8 @@
 # Select service user & group
 case node[:consul][:init_style]
 when 'runit'
+  include_recipe 'runit'
+
   consul_user = node[:consul][:service_user]
   consul_group = node[:consul][:service_group]
   consul_directories << '/var/log/consul'
@@ -116,8 +118,6 @@
     subscribes :restart, "file[#{node[:consul][:config_dir]}/default.json]", :delayed
   end
 when 'runit'
-  include_recipe 'runit'
-
   runit_service 'consul' do
     supports status: true, restart: true, reload: true
     action [:enable, :start]