From 4f806a1db917e913114dbc4b9e53923725f4fdd4 Mon Sep 17 00:00:00 2001 From: niphlod Date: Sat, 1 Jun 2013 14:02:48 +0200 Subject: [PATCH] fixed serving static files with static_version --- scripts/setup-web2py-fedora.sh | 4 ++-- scripts/setup-web2py-ubuntu.sh | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/setup-web2py-fedora.sh b/scripts/setup-web2py-fedora.sh index 2b148bd5..41184d46 100644 --- a/scripts/setup-web2py-fedora.sh +++ b/scripts/setup-web2py-fedora.sh @@ -314,7 +314,7 @@ NameVirtualHost *:443 - AliasMatch ^/([^/]+)/static/(.*) /opt/web-apps/web2py/applications/\$1/static/\$2 + AliasMatch ^/([^/]+)/static/(?:_[\d]+.[\d]+.[\d]+/)?(.*) /opt/web-apps/web2py/applications/\$1/static/\$2 Options -Indexes @@ -352,7 +352,7 @@ NameVirtualHost *:443 - AliasMatch ^/([^/]+)/static/(.*) /opt/web-apps/web2py/applications/\$1/static/\$2 + AliasMatch ^/([^/]+)/static/(?:_[\d]+.[\d]+.[\d]+/)?(.*) /opt/web-apps/web2py/applications/\$1/static/\$2 Options -Indexes diff --git a/scripts/setup-web2py-ubuntu.sh b/scripts/setup-web2py-ubuntu.sh index eca6e838..7a8f4126 100755 --- a/scripts/setup-web2py-ubuntu.sh +++ b/scripts/setup-web2py-ubuntu.sh @@ -106,7 +106,7 @@ WSGIDaemonProcess web2py user=www-data group=www-data - AliasMatch ^/([^/]+)/static/(.*) \ + AliasMatch ^/([^/]+)/static/(?:_[\d]+.[\d]+.[\d]+/)?(.*) \ /home/www-data/web2py/applications/$1/static/$2 Options -Indexes @@ -144,7 +144,7 @@ WSGIDaemonProcess web2py user=www-data group=www-data - AliasMatch ^/([^/]+)/static/(.*) \ + AliasMatch ^/([^/]+)/static/(?:_[\d]+.[\d]+.[\d]+/)?(.*) \ /home/www-data/web2py/applications/$1/static/$2 @@ -167,7 +167,7 @@ WSGIDaemonProcess web2py user=www-data group=www-data # ln -s /etc/pam.d/apache2 /etc/pam.d/httpd # usermod -a -G shadow www-data -echo "restarting apage" +echo "restarting apache" echo "================" /etc/init.d/apache2 restart