dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #405 from niphlod/fix/static_version_by_default

Browse Source 
static_version setup enabled by default
This commit is contained in:
mdipierro
2014-03-18 09:28:48 -05:00
parent 86fb431ed3 9a8231f675
commit 4e9554dca1
8 changed files with 54 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/nginx_scgi.conf
+3 -3
View File
@@ -80,9 +80,9 @@ http {
root /var/www/localhost/html; root /var/www/localhost/html;
} }
location ~* ^/(\w+)/static(?:/_[\d]+\.[\d]+\.[\d]+)?/(.*)$ {
location ^/(.*)/static/(.*) { alias $web2pyroot/applications/$1/static/$2;
alias $web2pyroot/applications/$1/static/$2; expires max;
} }
location / { location / {
scripts/setup-ubuntu-12-04-redmine-unicorn-web2py-uwsgi-nginx.sh
+7 -8
View File
@@ -326,14 +326,9 @@ server {
access_log /var/log/nginx/yoursite.access.log; access_log /var/log/nginx/yoursite.access.log;
error_log /var/log/nginx/yoursite.error.log; error_log /var/log/nginx/yoursite.error.log;
#to enable correct use of response.static_version #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; alias /home/www-data/web2py/applications/$1/static/$2;
# expires max; expires max;
#}
location ~* /(\w+)/static/ {
root /home/www-data/web2py/applications/;
#remove next comment on production
#expires max;
} }
location ~^\/(?!redmine(.*)) { location ~^\/(?!redmine(.*)) {
#uwsgi_pass 127.0.0.1:9001; #uwsgi_pass 127.0.0.1:9001;
@@ -366,6 +361,10 @@ server {
ssl_ciphers ECDHE-RSA-AES256-SHA:DHE-RSA-AES256-SHA:DHE-DSS-AES256-SHA:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA; ssl_ciphers ECDHE-RSA-AES256-SHA:DHE-RSA-AES256-SHA:DHE-DSS-AES256-SHA:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA;
ssl_protocols SSLv3 TLSv1; ssl_protocols SSLv3 TLSv1;
keepalive_timeout 70; keepalive_timeout 70;
location ~* /(\w+)/static(?:/_[\d]+\.[\d]+\.[\d]+)?/(.*)$ {
alias /home/www-data/web2py/applications/$1/static/$2;
expires max;
}
location ~^\/(?!redmine(.*)) { location ~^\/(?!redmine(.*)) {
#uwsgi_pass 127.0.0.1:9001; #uwsgi_pass 127.0.0.1:9001;
uwsgi_pass unix:///tmp/web2py.socket; uwsgi_pass unix:///tmp/web2py.socket;
scripts/setup-web2py-debian-sid.sh
+2 -2
View File
@@ -102,11 +102,11 @@ echo '
</Directory> </Directory>
<Location /admin> <Location /admin>
Require all denied Require all denied
</Location> </Location>
<LocationMatch ^/([^/]+)/appadmin> <LocationMatch ^/([^/]+)/appadmin>
Require all denied Require all denied
</LocationMatch> </LocationMatch>
CustomLog /var/log/apache2/access.log common CustomLog /var/log/apache2/access.log common
scripts/setup-web2py-fedora-ami.sh
+4 -3
View File
@@ -311,8 +311,8 @@ NameVirtualHost *:443
Allow from all Allow from all
</Files> </Files>
</Directory> </Directory>
AliasMatch ^/([^/]+)/static/(?:_[\d]+.[\d]+.[\d]+/)?(.*) \
AliasMatch ^/([^/]+)/static/(.*) /opt/web-apps/web2py/applications/\$1/static/\$2 /opt/web-apps/web2py/applications/\$1/static/\$2
<Directory /opt/web-apps/web2py/applications/*/static> <Directory /opt/web-apps/web2py/applications/*/static>
Options -Indexes Options -Indexes
@@ -350,7 +350,8 @@ NameVirtualHost *:443
</Files> </Files>
</Directory> </Directory>
AliasMatch ^/([^/]+)/static/(.*) /opt/web-apps/web2py/applications/\$1/static/\$2 AliasMatch ^/([^/]+)/static/(?:_[\d]+.[\d]+.[\d]+/)?(.*) \
/opt/web-apps/web2py/applications/\$1/static/\$2
<Directory /opt/web-apps/web2py/applications/*/static> <Directory /opt/web-apps/web2py/applications/*/static>
Options -Indexes Options -Indexes
scripts/setup-web2py-nginx-uwsgi-centos64.sh
+7 -8
View File
@@ -54,14 +54,9 @@ echo 'server {
listen YOUR_SERVER_IP:80; listen YOUR_SERVER_IP:80;
server_name YOUR_SERVER_FQDN; server_name YOUR_SERVER_FQDN;
#to enable correct use of response.static_version #to enable correct use of response.static_version
#location ~* /(\w+)/static(?:/_[\d]+\.[\d]+\.[\d]+)?/(.*)$ { location ~* /(\w+)/static(?:/_[\d]+\.[\d]+\.[\d]+)?/(.*)$ {
# alias /var/www/web2py/applications/$1/static/$2; alias /var/www/web2py/applications/$1/static/$2;
# expires max; expires max;
#}
location ~* /(\w+)/static/ {
root /var/www/web2py/applications/;
#remove next comment on production
#expires max;
} }
location / { location / {
#uwsgi_pass 127.0.0.1:9001; #uwsgi_pass 127.0.0.1:9001;
@@ -86,6 +81,10 @@ server {
ssl_ciphers ECDHE-RSA-AES256-SHA:DHE-RSA-AES256-SHA:DHE-DSS-AES256-SHA:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA; ssl_ciphers ECDHE-RSA-AES256-SHA:DHE-RSA-AES256-SHA:DHE-DSS-AES256-SHA:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA;
ssl_protocols SSLv3 TLSv1; ssl_protocols SSLv3 TLSv1;
keepalive_timeout 70; keepalive_timeout 70;
location ~* /(\w+)/static(?:/_[\d]+\.[\d]+\.[\d]+)?/(.*)$ {
alias /var/www/web2py/applications/$1/static/$2;
expires max;
}
location / { location / {
#uwsgi_pass 127.0.0.1:9001; #uwsgi_pass 127.0.0.1:9001;
uwsgi_pass unix:///var/www/web2py/logs/web2py.socket; uwsgi_pass unix:///var/www/web2py/logs/web2py.socket;
scripts/setup-web2py-nginx-uwsgi-on-centos.sh
+7 -2
View File
@@ -181,8 +181,9 @@ echo '
server { server {
listen 80; listen 80;
server_name $hostname; server_name $hostname;
location ~* /(\w+)/static/ { location ~* /(\w+)/static(?:/_[\d]+\.[\d]+\.[\d]+)?/(.*)$ {
root /opt/web-apps/web2py/applications/; alias /opt/web-apps/web2py/applications/$1/static/$2;
expires max;
} }
location / { location / {
uwsgi_pass 127.0.0.1:9001; uwsgi_pass 127.0.0.1:9001;
@@ -201,6 +202,10 @@ server {
include uwsgi_params; include uwsgi_params;
uwsgi_param UWSGI_SCHEME $scheme; uwsgi_param UWSGI_SCHEME $scheme;
} }
location ~* /(\w+)/static(?:/_[\d]+\.[\d]+\.[\d]+)?/(.*)$ {
alias /opt/web-apps/web2py/applications/$1/static/$2;
expires max;
}
} }
' > /etc/nginx/conf.d/web2py.conf ' > /etc/nginx/conf.d/web2py.conf
scripts/setup-web2py-nginx-uwsgi-opensuse.sh
+7 -8
View File
@@ -36,14 +36,9 @@ echo 'server {
listen 80; listen 80;
server_name $hostname; server_name $hostname;
#to enable correct use of response.static_version #to enable correct use of response.static_version
#location ~* /(\w+)/static(?:/_[\d]+\.[\d]+\.[\d]+)?/(.*)$ { location ~* /(\w+)/static(?:/_[\d]+\.[\d]+\.[\d]+)?/(.*)$ {
# alias /srv/www/web2py/applications/$1/static/$2; alias /srv/www/web2py/applications/$1/static/$2;
# expires max; expires max;
#}
location ~* /(\w+)/static/ {
root /srv/www/web2py/applications/;
#remove next comment on production
#expires max;
} }
location / { location / {
#uwsgi_pass 127.0.0.1:9001; #uwsgi_pass 127.0.0.1:9001;
@@ -64,6 +59,10 @@ server {
ssl_ciphers ECDHE-RSA-AES256-SHA:DHE-RSA-AES256-SHA:DHE-DSS-AES256-SHA:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA; ssl_ciphers ECDHE-RSA-AES256-SHA:DHE-RSA-AES256-SHA:DHE-DSS-AES256-SHA:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA;
ssl_protocols SSLv3 TLSv1; ssl_protocols SSLv3 TLSv1;
keepalive_timeout 70; keepalive_timeout 70;
location ~* /(\w+)/static(?:/_[\d]+\.[\d]+\.[\d]+)?/(.*)$ {
alias /srv/www/web2py/applications/$1/static/$2;
expires max;
}
location / { location / {
#uwsgi_pass 127.0.0.1:9001; #uwsgi_pass 127.0.0.1:9001;
uwsgi_pass unix:///tmp/web2py.socket; uwsgi_pass unix:///tmp/web2py.socket;
scripts/setup-web2py-nginx-uwsgi-ubuntu.sh
+17 -15
View File
@@ -43,10 +43,13 @@ echo 'server {
listen 80; listen 80;
server_name $hostname; server_name $hostname;
###to enable correct use of response.static_version ###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; alias /home/www-data/web2py/applications/$1/static/$2;
# expires max; expires max;
#} ### if you want to use pre-gzipped static files (recommended)
### check scripts/zip_static_files.py and remove the comments
# include /etc/nginx/conf.d/web2py/gzip_static.conf;
}
### ###
###if you use something like myapp = dict(languages=['en', 'it', 'jp'], default_language='en') in your routes.py ###if you use something like myapp = dict(languages=['en', 'it', 'jp'], default_language='en') in your routes.py
@@ -55,15 +58,7 @@ echo 'server {
# try_files static/$2/$3 static/$3 =404; # try_files static/$2/$3 static/$3 =404;
#} #}
### ###
location ~* ^/(\w+)/static/ {
root /home/www-data/web2py/applications/;
#remove next comment on production
#expires max;
### if you want to use pre-gzipped static files (recommended)
### check scripts/zip_static_files.py and remove the comments
# include /etc/nginx/conf.d/web2py/gzip_static.conf;
###
}
location / { location / {
#uwsgi_pass 127.0.0.1:9001; #uwsgi_pass 127.0.0.1:9001;
uwsgi_pass unix:///tmp/web2py.socket; uwsgi_pass unix:///tmp/web2py.socket;
@@ -104,8 +99,15 @@ server {
#client_max_body_size 10m; #client_max_body_size 10m;
### ###
} }
## if you serve static files through https, copy here the section ###to enable correct use of response.static_version
## from the previous server instance to manage static files location ~* ^/(\w+)/static(?:/_[\d]+\.[\d]+\.[\d]+)?/(.*)$ {
alias /home/www-data/web2py/applications/$1/static/$2;
expires max;
### if you want to use pre-gzipped static files (recommended)
### check scripts/zip_static_files.py and remove the comments
# include /etc/nginx/conf.d/web2py/gzip_static.conf;
}
###
}' >/etc/nginx/sites-available/web2py }' >/etc/nginx/sites-available/web2py