Download as
Browse Code »

Commit 4fff03330994848130300901cb3bbd272216881a

Authored by Antonio Terceiro
1 parent 96839740
Exists in master and in 90 other branches 3.x, add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup, backup_not_prod, cdtc_configuration, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev-lappis, dev_env_minimal, disable_email_dev, docs, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, performance, prezento, r3, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_backup_emails, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, stable-devel, support_docs, syslog, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes

colab: split database configuration into its own file 

like the RPM package does
Showing 3 changed files with 13 additions and 6 deletions   Show diff stats
cookbooks/colab/recipes/default.rb
  Diff comments   View file @4fff033
@@ -27,6 +27,13 @@ template '/etc/colab/settings.yaml' do @@ -27,6 +27,13 @@ template '/etc/colab/settings.yaml' do
27 notifies :restart, 'service[colab]' 27 notifies :restart, 'service[colab]'
28 end 28 end
29 29
  30 +template '/etc/colab/settings.d/00-database.yaml' do
  31 + owner 'root'
  32 + group 'colab'
  33 + mode 0640
  34 + notifies :restart, 'service[colab]'
  35 +end
  36 +
30 cookbook_file '/usr/lib/colab/lib/python2.7/site-packages/colab/static/img/logo.svg' do 37 cookbook_file '/usr/lib/colab/lib/python2.7/site-packages/colab/static/img/logo.svg' do
31 owner 'root' 38 owner 'root'
32 group 'root' 39 group 'root'
cookbooks/colab/templates/00-database.yaml.erb 0 → 100644
  Diff comments   View file @4fff033
@@ -0,0 +1,6 @@ @@ -0,0 +1,6 @@
  1 +DATABASES:
  2 + default:
  3 + ENGINE: django.db.backends.postgresql_psycopg2
  4 + NAME: colab
  5 + USER: colab
  6 + HOST: <%= node['peers']['database'] %>
cookbooks/colab/templates/settings.yaml.erb
  Diff comments   View file @4fff033
1 -DATABASES:  
2 - default:  
3 - ENGINE: django.db.backends.postgresql_psycopg2  
4 - NAME: colab  
5 - USER: colab  
6 - HOST: <%= node['peers']['database'] %>  
7 1
8 ## Set to false in production 2 ## Set to false in production
9 DEBUG: false 3 DEBUG: false