From 772b9f4e1356082d65a615352b7239b9d3ca33c4 Mon Sep 17 00:00:00 2001 From: Sergio Oliveira Date: Thu, 10 Dec 2015 15:38:44 -0200 Subject: [PATCH] Fixed nginx redirects for sisp --- cookbooks/reverse_proxy/templates/reverse_proxy.conf.erb | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/cookbooks/reverse_proxy/templates/reverse_proxy.conf.erb b/cookbooks/reverse_proxy/templates/reverse_proxy.conf.erb index a3dcf1a..9fb0b7f 100644 --- a/cookbooks/reverse_proxy/templates/reverse_proxy.conf.erb +++ b/cookbooks/reverse_proxy/templates/reverse_proxy.conf.erb @@ -12,7 +12,7 @@ server { server { listen *:443 ssl; - server_name <%= node['config']['external_hostname'] %> <%= node['config']['sisp_external_hostname'] %>; + server_name <%= node['config']['external_hostname'] %>; client_max_body_size 500m; ssl on; @@ -28,10 +28,6 @@ server { access_log /var/log/nginx/ssl-<%= node['config']['external_hostname'] %>.access.log; error_log /var/log/nginx/ssl-<%= node['config']['external_hostname'] %>.error.log; - location ~ ^/social/sisp { - return 302 http://<%= node['config']['sisp_external_hostname'] %>; - } - # TODO caching location / { proxy_pass http://colab; @@ -71,14 +67,6 @@ server { access_log /var/log/nginx/ssl-<%= node['config']['sisp_external_hostname'] %>.access.log; error_log /var/log/nginx/ssl-<%= node['config']['sisp_external_hostname'] %>.error.log; - location ~ ^/$ { - return 301 /social/sisp; - } - - location ~ ^/gitlab { - return 302 http://<%= node['config']['external_hostname'] %>$request_uri; - } - # TODO caching location / { proxy_pass http://colab; @@ -93,8 +81,4 @@ server { proxy_set_header REMOTE_USER ''; } - location /doc { - root /srv; - } - } -- libgit2 0.21.2