Commit 772b9f4e1356082d65a615352b7239b9d3ca33c4

Authored by Sergio Oliveira
Committed by Luciano Prestes
1 parent 2c9208e0

Fixed nginx redirects for sisp

cookbooks/reverse_proxy/templates/reverse_proxy.conf.erb
@@ -12,7 +12,7 @@ server { @@ -12,7 +12,7 @@ server {
12 server { 12 server {
13 listen *:443 ssl; 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 client_max_body_size 500m; 16 client_max_body_size 500m;
17 17
18 ssl on; 18 ssl on;
@@ -28,10 +28,6 @@ server { @@ -28,10 +28,6 @@ server {
28 access_log /var/log/nginx/ssl-<%= node['config']['external_hostname'] %>.access.log; 28 access_log /var/log/nginx/ssl-<%= node['config']['external_hostname'] %>.access.log;
29 error_log /var/log/nginx/ssl-<%= node['config']['external_hostname'] %>.error.log; 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 # TODO caching 31 # TODO caching
36 location / { 32 location / {
37 proxy_pass http://colab; 33 proxy_pass http://colab;
@@ -71,14 +67,6 @@ server { @@ -71,14 +67,6 @@ server {
71 access_log /var/log/nginx/ssl-<%= node['config']['sisp_external_hostname'] %>.access.log; 67 access_log /var/log/nginx/ssl-<%= node['config']['sisp_external_hostname'] %>.access.log;
72 error_log /var/log/nginx/ssl-<%= node['config']['sisp_external_hostname'] %>.error.log; 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 # TODO caching 70 # TODO caching
83 location / { 71 location / {
84 proxy_pass http://colab; 72 proxy_pass http://colab;
@@ -93,8 +81,4 @@ server { @@ -93,8 +81,4 @@ server {
93 proxy_set_header REMOTE_USER ''; 81 proxy_set_header REMOTE_USER '';
94 } 82 }
95 83
96 - location /doc {  
97 - root /srv;  
98 - }  
99 -  
100 } 84 }