diff options
Diffstat (limited to 'rpkid/portal-gui')
| -rw-r--r-- | rpkid/portal-gui/Makefile.in | 9 | ||||
| -rw-r--r-- | rpkid/portal-gui/apache/rpki.conf.in | 5 |
2 files changed, 9 insertions, 5 deletions
diff --git a/rpkid/portal-gui/Makefile.in b/rpkid/portal-gui/Makefile.in index 9dc33f81..946e877c 100644 --- a/rpkid/portal-gui/Makefile.in +++ b/rpkid/portal-gui/Makefile.in @@ -17,13 +17,15 @@ libexecdir=@libexecdir@ WEBUSER=@WEBUSER@ DJANGO_ADMIN=@DJANGO_ADMIN@ +PYTHON=@PYTHON@ +DJANGO_DIR=@DJANGO_DIR@ INSTALL = @INSTALL@ CONFDIR=${DESTDIR}$(localstatedir)/rpki/conf DATABASE_PATH=${DESTDIR}$(localstatedir)/rpki/gui.db INSTDIR=${DESTDIR}$(datarootdir)/rpki/gui -TEMPLATEDIR=$(INSTDIR)/templates +STATIC_DIR=${INSTDIR}/static # automatically built sources BUILD=apache/rpki.conf @@ -38,7 +40,9 @@ distclean: clean rm -f Makefile edit = sed \ - -e 's|@INSTDIR[@]|$(INSTDIR)|g' + -e 's|@DJANGO_DIR[@]|$(DJANGO_DIR)|g' \ + -e 's|@INSTDIR[@]|$(INSTDIR)|g' \ + -e 's|@STATIC_DIR[@]|$(STATIC_DIR)|g' apache/rpki.conf: $(srcdir)/apache/rpki.conf.in Makefile $(edit) $@.in > $@ @@ -59,6 +63,7 @@ install-apache: install-data: $(BUILD) install-apache mkdir -p `dirname $(DATABASE_PATH)` $(DJANGO_ADMIN) syncdb --settings rpki.gui.settings + $(DJANGO_ADMIN) collectstatic --settings rpki.gui.settings --noinput if [ ! -f $(INSTDIR)/rpki.conf.template ]; then ${INSTALL} -m 644 ../examples/rpki.conf $(INSTDIR)/rpki.conf.template; fi install: install-data install-perms diff --git a/rpkid/portal-gui/apache/rpki.conf.in b/rpkid/portal-gui/apache/rpki.conf.in index 3dc2974f..064b55e0 100644 --- a/rpkid/portal-gui/apache/rpki.conf.in +++ b/rpkid/portal-gui/apache/rpki.conf.in @@ -19,9 +19,8 @@ Order deny,allow Allow from all </Directory> -# media for the /admin/ site -Alias /media/ /usr/lib/python2.6/site-packages/django/contrib/admin/media/ -<Directory /usr/lib/python2.6/site-packages/django/contrib/admin/media> +Alias /static/ @STATIC_DIR@/ +<Directory @STATIC_DIR@> Order allow,deny Allow from all </Directory> |