Download as
Browse Code »

Commit 69a31ac314d93abba197f860d5720d130605c635

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

Switch gitlab to port 81 

On SELinux-enabled systems there is a restriction on which ports you can
actually bind to. 81 is allowed by the defautl configuration so let's
go with that.
Showing 3 changed files with 3 additions and 3 deletions   Show diff stats
cookbooks/colab/templates/01-apps.yaml.erb
  Diff comments   View file @69a31ac
1 ### Colab proxied apps 1 ### Colab proxied apps
2 PROXIED_APPS: 2 PROXIED_APPS:
3 gitlab: 3 gitlab:
4 - upstream: 'http://<%= node['peers']['integration'] %>:8081/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'] %>:8080/social/'
cookbooks/gitlab/templates/nginx.conf.erb
  Diff comments   View file @69a31ac
@@ -3,7 +3,7 @@ upstream gitlab { @@ -3,7 +3,7 @@ upstream gitlab {
3 } 3 }
4 4
5 server { 5 server {
6 - listen *:8081; 6 + listen *:81;
7 7
8 server_name <%= node['config']['external_hostname'] %>; 8 server_name <%= node['config']['external_hostname'] %>;
9 underscores_in_headers on; 9 underscores_in_headers on;
test/gitlab_test.sh
  Diff comments   View file @69a31ac
@@ -14,7 +14,7 @@ test_gitlab_responds() { @@ -14,7 +14,7 @@ test_gitlab_responds() {
14 14
15 test_static_content_served_correctly() { 15 test_static_content_served_correctly() {
16 file=$(run_on integration ls -1 '/usr/lib/gitlab/public/assets/*.css' | head -1 | xargs basename) 16 file=$(run_on integration ls -1 '/usr/lib/gitlab/public/assets/*.css' | head -1 | xargs basename)
17 - assertTrue 'gitlab static content served by nginx' "run_on integration curl --head http://localhost:8081/gitlab/assets/$file | grep 'Content-Type: text/css'" 17 + assertTrue 'gitlab static content served by nginx' "run_on integration curl --head http://localhost:81/gitlab/assets/$file | grep 'Content-Type: text/css'"
18 } 18 }
19 19
20 test_redirects_to_the_correct_host() { 20 test_redirects_to_the_correct_host() {