Download as
Browse Code »

Commit 1821f9f5c31d4771d263e3f6e85076eca367157c

Authored by Antonio Terceiro
1 parent b93dc969
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

Use only softwarepubico.dev as hostname for development

Showing 3 changed files with 5 additions and 6 deletions   Show diff stats
cookbooks/colab/templates/colab.conf.erb
  Diff comments   View file @1821f9f
@@ -5,7 +5,7 @@ upstream colab { @@ -5,7 +5,7 @@ upstream colab {
5 server { 5 server {
6 listen *:80; 6 listen *:80;
7 7
8 - server_name <%= node['config']['external_hostname'] %> softwarepublico.dev; 8 + server_name <%= node['config']['external_hostname'] %>;
9 9
10 access_log /var/log/nginx/colab.access.log; 10 access_log /var/log/nginx/colab.access.log;
11 error_log /var/log/nginx/colab.error.log; 11 error_log /var/log/nginx/colab.error.log;
cookbooks/colab/templates/settings.yaml.erb
  Diff comments   View file @1821f9f
@@ -35,7 +35,6 @@ BROWSERID_AUDIENCES: @@ -35,7 +35,6 @@ BROWSERID_AUDIENCES:
35 - <%= node['config']['site_url'].sub('https:', 'http:') %> 35 - <%= node['config']['site_url'].sub('https:', 'http:') %>
36 36
37 ALLOWED_HOSTS: 37 ALLOWED_HOSTS:
38 - - softwarepublico.dev # for development/tests  
39 - <%= node['config']['external_hostname'] %> 38 - <%= node['config']['external_hostname'] %>
40 39
41 ## Disable indexing 40 ## Disable indexing
@@ -7,10 +7,10 @@ vagrant@integration: @@ -7,10 +7,10 @@ vagrant@integration:
7 - 7 -
8 - Paulo Meirelles 8 - Paulo Meirelles
9 - paulo@softwarelivre.org 9 - paulo@softwarelivre.org
10 - external_hostname: beta.softwarepublico.gov.br  
11 - site_url: https://beta.softwarepublico.gov.br  
12 - colab_from_address: '"Portal do Software Publico" <noreply@beta.softwarepublico.gov.br>'  
13 - server_email: '"Portal do Software Publico" <noreply@beta.softwarepublico.gov.br>' 10 + external_hostname: softwarepublico.dev
  11 + site_url: https://softwarepublico.dev
  12 + colab_from_address: '"Portal do Software Publico" <noreply@softwarepublico.dev>'
  13 + server_email: '"Portal do Software Publico" <noreply@softwarepublico.dev>'
14 email_subject_prefix: '[spb]' 14 email_subject_prefix: '[spb]'
15 peers: &PEERS 15 peers: &PEERS
16 integration: 10.10.10.2 16 integration: 10.10.10.2