Commit 3918dc23 authored by Ryan Herbert's avatar Ryan Herbert Committed by marc duez
Browse files

nginx_web2py(_http) test some rewrite rules

In order to attempt using different prefixes for the client
parent 81d00ab9
...@@ -25,7 +25,7 @@ server { ...@@ -25,7 +25,7 @@ server {
uwsgi_max_temp_file_size 20480m; uwsgi_max_temp_file_size 20480m;
location / { location ~ /(vidjil|admin) {
include /etc/nginx/conf.d/web2py/uwsgi.conf; include /etc/nginx/conf.d/web2py/uwsgi.conf;
proxy_read_timeout 600; proxy_read_timeout 600;
client_max_body_size 20G; client_max_body_size 20G;
...@@ -41,7 +41,8 @@ server { ...@@ -41,7 +41,8 @@ server {
error_page 405 = $1; error_page 405 = $1;
location /browser { location /(c|client|browser) {
rewrite /(c|client|browser) /browser;
rewrite /browser/([0-9]+)/([0-9]+)(\/?) /browser/?set=$1&conf=$2 break; rewrite /browser/([0-9]+)/([0-9]+)(\/?) /browser/?set=$1&conf=$2 break;
rewrite /browser/([0-9/]+)/(css|js|images|test)/(.*) /browser/$2/$3 redirect; rewrite /browser/([0-9/]+)/(css|js|images|test)/(.*) /browser/$2/$3 redirect;
root /usr/share/vidjil; root /usr/share/vidjil;
......
...@@ -8,7 +8,7 @@ server { ...@@ -8,7 +8,7 @@ server {
uwsgi_max_temp_file_size 20480m; uwsgi_max_temp_file_size 20480m;
location / { location ~ /(vidjil|admin) {
include /etc/nginx/conf.d/web2py/uwsgi.conf; include /etc/nginx/conf.d/web2py/uwsgi.conf;
proxy_read_timeout 600; proxy_read_timeout 600;
client_max_body_size 20G; client_max_body_size 20G;
...@@ -18,7 +18,8 @@ server { ...@@ -18,7 +18,8 @@ server {
## if you serve static files through https, copy here the section ## if you serve static files through https, copy here the section
## from the previous server instance to manage static files ## from the previous server instance to manage static files
location /browser { location /(c|client|browser) {
rewrite /(c|client|browser) /browser;
rewrite /browser/([0-9]+)/([0-9]+)(\/?) /browser/?set=$1&conf=$2 break; rewrite /browser/([0-9]+)/([0-9]+)(\/?) /browser/?set=$1&conf=$2 break;
rewrite /browser/([0-9/]+)/(css|js|images|test)/(.*) /browser/$2/$3 redirect; rewrite /browser/([0-9/]+)/(css|js|images|test)/(.*) /browser/$2/$3 redirect;
root /usr/share/vidjil; root /usr/share/vidjil;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment