Commit d0c7dab31251b8c53cb77c9af845e6fc2d59fbf6

Authored by Antonio Terceiro
1 parent c6e01c8d

Fix services configuration

:start will only start momentaneously, on CentOS you also need :enable
to make the service start on boot.

Also, provisioning colab requires the database to be up, so added a rake
dependency to make sure the database node is always provisioned before
the colab node.
@@ -17,3 +17,6 @@ file '.ssh_config' => ['nodes.yaml', 'ssh_config.erb'] do |t| @@ -17,3 +17,6 @@ file '.ssh_config' => ['nodes.yaml', 'ssh_config.erb'] do |t|
17 end 17 end
18 18
19 task :bootstrap_common => '.ssh_config' 19 task :bootstrap_common => '.ssh_config'
  20 +
  21 +# dependencies
  22 +task 'bootstrap:integration' => 'converge:database'
cookbooks/basics/recipes/nginx.rb
@@ -7,6 +7,6 @@ end @@ -7,6 +7,6 @@ end
7 package 'nginx' 7 package 'nginx'
8 8
9 service 'nginx' do 9 service 'nginx' do
10 - action :start 10 + action [:enable, :start]
11 supports :restart => true 11 supports :restart => true
12 end 12 end
cookbooks/colab/recipes/default.rb
@@ -30,6 +30,6 @@ execute 'colab-admin migrate' @@ -30,6 +30,6 @@ execute 'colab-admin migrate'
30 execute 'colab-admin collectstatic --noinput' 30 execute 'colab-admin collectstatic --noinput'
31 31
32 service 'colab' do 32 service 'colab' do
33 - action :start 33 + action [:enable, :start]
34 supports :restart => true 34 supports :restart => true
35 end 35 end
cookbooks/postgresql/recipes/default.rb
@@ -17,6 +17,6 @@ template '/var/lib/pgsql/data/postgresql.conf' do @@ -17,6 +17,6 @@ template '/var/lib/pgsql/data/postgresql.conf' do
17 end 17 end
18 18
19 service 'postgresql' do 19 service 'postgresql' do
20 - action :start 20 + action [:enable, :start]
21 supports :restart => true 21 supports :restart => true
22 end 22 end