decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

static/admin is populated via collectstatic now

Browse source
This commit is contained in:
j 2012-06-13 00:01:27 +02:00
parent 21867e42f2
commit a96125044d
3 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
etc/apache2/vhost.conf.in
View file

@ -23,7 +23,6 @@
ProxyPass /static ! ProxyPass /static !
ProxyPass /favicon.ico ! ProxyPass /favicon.ico !
ProxyPass /robots.txt ! ProxyPass /robots.txt !
ProxyPass /admin/media !
ProxyPass /data ! ProxyPass /data !
ProxyPass /.bzr ! ProxyPass /.bzr !
@ -32,7 +31,6 @@
Alias /static __PREFIX__/static Alias /static __PREFIX__/static
Alias /favicon.ico __PREFIX__/static/favicon.ico Alias /favicon.ico __PREFIX__/static/favicon.ico
Alias /data __PREFIX__/data Alias /data __PREFIX__/data
Alias /static/admin __PREFIX__/django/django/contrib/admin
ProxyPreserveHost On ProxyPreserveHost On
ProxyPass / http://127.0.0.1:2620/ ProxyPass / http://127.0.0.1:2620/

4
etc/nginx/vhost.in
View file

@ -24,10 +24,6 @@ server {
root __PREFIX__/static; root __PREFIX__/static;
} }
location /static/admin/ {
root __PREFIX__/django/django/contrib/admin;
autoindex on;
}
location /static/ { location /static/ {
root __PREFIX__; root __PREFIX__;
autoindex on; autoindex on;

1
vm/firstboot.sh
View file

@ -54,6 +54,7 @@ echo "UPDATE django_site SET domain = '$HOST.local', name = '$HOST.local' WHERE
mkdir /srv/pandora/data mkdir /srv/pandora/data
chown -R pandora:pandora /srv/pandora chown -R pandora:pandora /srv/pandora
sudo -u pandora python manage.py update_static sudo -u pandora python manage.py update_static
sudo -u pandora python manage.py collectstatic -l --noinput
cp /srv/pandora/etc/init/* /etc/init/ cp /srv/pandora/etc/init/* /etc/init/