Download as
Browse Code »

Commit 493032bc38293f9c34241cb970ded71679bd177d

Authored by Antonio Terceiro
1 parent 79bcb918
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: switch to port 80

Showing 3 changed files with 5 additions and 5 deletions   Show diff stats
cookbooks/colab/templates/01-apps.yaml.erb
  Diff comments   View file @493032b
@@ -3,4 +3,4 @@ PROXIED_APPS: @@ -3,4 +3,4 @@ PROXIED_APPS:
3 gitlab: 3 gitlab:
4 upstream: 'http://<%= node['peers']['integration'] %>:81/gitlab/' 4 upstream: 'http://<%= node['peers']['integration'] %>:81/gitlab/'
5 noosfero: 5 noosfero:
6 - upstream: 'http://<%= node['peers']['social'] %>:8080/social/' 6 + upstream: 'http://<%= node['peers']['social'] %>:80/social/'
cookbooks/noosfero/templates/nginx.conf.erb
  Diff comments   View file @493032b
@@ -7,8 +7,8 @@ upstream noosfero { @@ -7,8 +7,8 @@ upstream noosfero {
7 } 7 }
8 8
9 server { 9 server {
10 - listen *:8080;  
11 - server_name <%= node['config']['external_hostname'] %>; 10 + listen *:80;
  11 + server_name <%= node['config']['external_hostname'] %> <%= node['peers']['social'] %>;
12 underscores_in_headers on; 12 underscores_in_headers on;
13 access_log /var/log/nginx/noosfero.access.log; 13 access_log /var/log/nginx/noosfero.access.log;
14 error_log /var/log/nginx/noosfero.error.log; 14 error_log /var/log/nginx/noosfero.error.log;
test/noosfero_test.sh
  Diff comments   View file @493032b
@@ -14,12 +14,12 @@ test_noosfero_on_subdir() { @@ -14,12 +14,12 @@ test_noosfero_on_subdir() {
14 } 14 }
15 15
16 test_reverse_proxy_noosfero() { 16 test_reverse_proxy_noosfero() {
17 - local meta="$(run_on social curl-host softwarepublico.dev http://localhost:8080/social | sed -e '/noosfero:root/ !d; s/^\s*//')" 17 + local meta="$(run_on social curl-host softwarepublico.dev http://localhost/social | sed -e '/noosfero:root/ !d; s/^\s*//')"
18 assertEquals '<meta property="noosfero:root" content="/social"/>' "$meta" 18 assertEquals '<meta property="noosfero:root" content="/social"/>' "$meta"
19 } 19 }
20 20
21 test_reverse_proxy_static_files() { 21 test_reverse_proxy_static_files() {
22 - local content_type="$(curl-host softwarepublico.dev --head http://$social:8080/social/images/noosfero-network.png | grep-header Content-Type)" 22 + local content_type="$(curl-host softwarepublico.dev --head http://$social/social/images/noosfero-network.png | grep-header Content-Type)"
23 assertEquals "Content-Type: image/png" "$content_type" 23 assertEquals "Content-Type: image/png" "$content_type"
24 } 24 }
25 25