From d0c7dab31251b8c53cb77c9af845e6fc2d59fbf6 Mon Sep 17 00:00:00 2001
From: Antonio Terceiro <terceiro@softwarelivre.org>
Date: Thu, 12 Feb 2015 11:54:56 -0200
Subject: [PATCH] Fix services configuration

---
 Rakefile                                | 3 +++
 cookbooks/basics/recipes/nginx.rb       | 2 +-
 cookbooks/colab/recipes/default.rb      | 2 +-
 cookbooks/postgresql/recipes/default.rb | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Rakefile b/Rakefile
index 4f1940a..b57e07e 100644
--- a/Rakefile
+++ b/Rakefile
@@ -17,3 +17,6 @@ file '.ssh_config' => ['nodes.yaml', 'ssh_config.erb'] do |t|
 end
 
 task :bootstrap_common => '.ssh_config'
+
+# dependencies
+task 'bootstrap:integration' => 'converge:database'
diff --git a/cookbooks/basics/recipes/nginx.rb b/cookbooks/basics/recipes/nginx.rb
index 0c22182..7f82bd7 100644
--- a/cookbooks/basics/recipes/nginx.rb
+++ b/cookbooks/basics/recipes/nginx.rb
@@ -7,6 +7,6 @@ end
 package 'nginx'
 
 service 'nginx' do
-  action :start
+  action [:enable, :start]
   supports :restart => true
 end
diff --git a/cookbooks/colab/recipes/default.rb b/cookbooks/colab/recipes/default.rb
index b4014c7..82417bb 100644
--- a/cookbooks/colab/recipes/default.rb
+++ b/cookbooks/colab/recipes/default.rb
@@ -30,6 +30,6 @@ execute 'colab-admin migrate'
 execute 'colab-admin collectstatic --noinput'
 
 service 'colab' do
-  action :start
+  action [:enable, :start]
   supports :restart => true
 end
diff --git a/cookbooks/postgresql/recipes/default.rb b/cookbooks/postgresql/recipes/default.rb
index 597cd10..fd682e8 100644
--- a/cookbooks/postgresql/recipes/default.rb
+++ b/cookbooks/postgresql/recipes/default.rb
@@ -17,6 +17,6 @@ template '/var/lib/pgsql/data/postgresql.conf' do
 end
 
 service 'postgresql' do
-  action :start
+  action [:enable, :start]
   supports :restart => true
 end
--
libgit2 0.21.2