Download as
Browse Code »

Commit 772b9f4e1356082d65a615352b7239b9d3ca33c4

Authored by Sergio Oliveira
Committed by Luciano Prestes
1 parent 2c9208e0
Exists in master and in 51 other branches add_sisp_to_chef, add_super_archives_plugin, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, disable_email_dev, 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_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, header_fix, lxc_settings, margin_fix, mezuro_cookbook, refactor_download_block, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_to_rails4, stable-4.1, stable-4.2, stable-4.x, theme_header, theme_javascript_refactory, thread_dropdown, update_search_by_categories, update_software_api

Fixed nginx redirects for sisp

Showing 1 changed file with 1 additions and 17 deletions   Show diff stats
cookbooks/reverse_proxy/templates/reverse_proxy.conf.erb
  Diff comments   View file @772b9f4
... ... @@ -12,7 +12,7 @@ server {
12 12 server {
13 13 listen *:443 ssl;
14 14  
15   - server_name <%= node['config']['external_hostname'] %> <%= node['config']['sisp_external_hostname'] %>;
  15 + server_name <%= node['config']['external_hostname'] %>;
16 16 client_max_body_size 500m;
17 17  
18 18 ssl on;
... ... @@ -28,10 +28,6 @@ server {
28 28 access_log /var/log/nginx/ssl-<%= node['config']['external_hostname'] %>.access.log;
29 29 error_log /var/log/nginx/ssl-<%= node['config']['external_hostname'] %>.error.log;
30 30  
31   - location ~ ^/social/sisp {
32   - return 302 http://<%= node['config']['sisp_external_hostname'] %>;
33   - }
34   -
35 31 # TODO caching
36 32 location / {
37 33 proxy_pass http://colab;
... ... @@ -71,14 +67,6 @@ server {
71 67 access_log /var/log/nginx/ssl-<%= node['config']['sisp_external_hostname'] %>.access.log;
72 68 error_log /var/log/nginx/ssl-<%= node['config']['sisp_external_hostname'] %>.error.log;
73 69  
74   - location ~ ^/$ {
75   - return 301 /social/sisp;
76   - }
77   -
78   - location ~ ^/gitlab {
79   - return 302 http://<%= node['config']['external_hostname'] %>$request_uri;
80   - }
81   -
82 70 # TODO caching
83 71 location / {
84 72 proxy_pass http://colab;
... ... @@ -93,8 +81,4 @@ server {
93 81 proxy_set_header REMOTE_USER '';
94 82 }
95 83  
96   - location /doc {
97   - root /srv;
98   - }
99   -
100 84 }
... ...