Download as
Browse Code »

Commit 89bff4522b281c40c8b48fd070597e771469b15b

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

noosfero: fix hostname used in redirects

Showing 2 changed files with 6 additions and 1 deletions   Show diff stats
cookbooks/noosfero/templates/nginx.conf.erb
  Diff comments   View file @89bff45
@@ -23,7 +23,7 @@ server { @@ -23,7 +23,7 @@ server {
23 proxy_read_timeout 90; 23 proxy_read_timeout 90;
24 proxy_connect_timeout 90; 24 proxy_connect_timeout 90;
25 proxy_redirect off; 25 proxy_redirect off;
26 - proxy_set_header Host $host; 26 + proxy_set_header Host <%= node['config']['external_hostname'] %>;
27 proxy_set_header X-Real-IP $remote_addr; 27 proxy_set_header X-Real-IP $remote_addr;
28 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; 28 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
29 } 29 }
test/noosfero_test.sh
  Diff comments   View file @89bff45
@@ -23,5 +23,10 @@ test_reverse_proxy_static_files() { @@ -23,5 +23,10 @@ test_reverse_proxy_static_files() {
23 assertEquals "Content-Type: image/png" "$content_type" 23 assertEquals "Content-Type: image/png" "$content_type"
24 } 24 }
25 25
  26 +test_redirect_with_correct_hostname_behind_proxy() {
  27 + local redirect="$(curl-host softwarepublico.dev --head https://softwarepublico.dev/social/search/contents | grep-header Location)"
  28 + assertEquals "Location: https://softwarepublico.dev/social/search/articles" "$redirect"
  29 +}
  30 +
26 31
27 load_shunit2 32 load_shunit2