Download as
Browse Code »

Commit d0c7dab31251b8c53cb77c9af845e6fc2d59fbf6

Authored by Antonio Terceiro
1 parent c6e01c8d
Exists in master and in 67 other branches 3.x, add_you_are_here_breadcrumbs_label, api_for_colab, backup, backup_not_prod, button_suspension_points_remove, cdtc_configuration, create_institution_bootstrap_modal, design_validation, dev-lappis, dev_env_minimal, disable_email_dev, docs, fix_edit_institution, fix_edit_software_with_another_license, fix_list_style_inside_article, fix_members_pagination, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_validations_and_tests, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc, mailinglist_page_title, margin_fix, mezuro_cookbook, organization_rating_style_changes, performance, prezento, r3, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_backup_emails, remove_secondary_email_from_user, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_catalog_style_fixes, spb_minimal_env, spec_refactor, stable-4.x, stable-devel, support_docs, syslog, temp_soft_comm_refactoring, thread_dropdown, thread_page, update_software_api, update_softwares_boxes

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.
Showing 4 changed files with 6 additions and 3 deletions   Show diff stats
Rakefile
  Diff comments   View file @d0c7dab
... ... @@ -17,3 +17,6 @@ file '.ssh_config' => ['nodes.yaml', 'ssh_config.erb'] do |t|
17 17 end
18 18  
19 19 task :bootstrap_common => '.ssh_config'
  20 +
  21 +# dependencies
  22 +task 'bootstrap:integration' => 'converge:database'
... ...
cookbooks/basics/recipes/nginx.rb
  Diff comments   View file @d0c7dab
... ... @@ -7,6 +7,6 @@ end
7 7 package 'nginx'
8 8  
9 9 service 'nginx' do
10   - action :start
  10 + action [:enable, :start]
11 11 supports :restart => true
12 12 end
... ...
cookbooks/colab/recipes/default.rb
  Diff comments   View file @d0c7dab
... ... @@ -30,6 +30,6 @@ execute 'colab-admin migrate'
30 30 execute 'colab-admin collectstatic --noinput'
31 31  
32 32 service 'colab' do
33   - action :start
  33 + action [:enable, :start]
34 34 supports :restart => true
35 35 end
... ...
cookbooks/postgresql/recipes/default.rb
  Diff comments   View file @d0c7dab
... ... @@ -17,6 +17,6 @@ template '/var/lib/pgsql/data/postgresql.conf' do
17 17 end
18 18  
19 19 service 'postgresql' do
20   - action :start
  20 + action [:enable, :start]
21 21 supports :restart => true
22 22 end
... ...