From 70f34e453267f2089f4da7bd58ca7fc3deddb5d2 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Fri, 12 Jul 2013 11:58:16 -0500 Subject: [PATCH] better scripts/setup-web2py-nginx-uwsgi-ubuntu.sh, thanks Anthony --- VERSION | 2 +- scripts/setup-web2py-nginx-uwsgi-ubuntu.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index 6d0f183c..4acd8a5f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.6.0-development+timestamp.2013.07.12.09.51.41 +Version 2.6.0-development+timestamp.2013.07.12.11.57.25 diff --git a/scripts/setup-web2py-nginx-uwsgi-ubuntu.sh b/scripts/setup-web2py-nginx-uwsgi-ubuntu.sh index 725f220d..21ec33c2 100644 --- a/scripts/setup-web2py-nginx-uwsgi-ubuntu.sh +++ b/scripts/setup-web2py-nginx-uwsgi-ubuntu.sh @@ -43,19 +43,19 @@ echo 'server { listen 80; server_name $hostname; ###to enable correct use of response.static_version - #location ~* /(\w+)/static(?:/_[\d]+\.[\d]+\.[\d]+)?/(.*)$ { + #location ~* ^/(\w+)/static(?:/_[\d]+\.[\d]+\.[\d]+)?/(.*)$ { # alias /home/www-data/web2py/applications/$1/static/$2; # expires max; #} ### ###if you use something like myapp = dict(languages=['en', 'it', 'jp'], default_language='en') in your routes.py - #location ~* /(\w+)/(en|it|jp)/static/(.*)$ { + #location ~* ^/(\w+)/(en|it|jp)/static/(.*)$ { # alias /home/www-data/web2py/applications/$1/; # try_files static/$2/$3 static/$3 =404; #} ### - location ~* /(\w+)/static/ { + location ~* ^/(\w+)/static/ { root /home/www-data/web2py/applications/; #remove next comment on production #expires max;