4 files changed, 17 insertions, 10 deletions
diff --git a/rpkid/Makefile.in b/rpkid/Makefile.in
index df43703e..ccd7a1f6 100644
--- a/rpkid/Makefile.in
+++ b/rpkid/Makefile.in
@@ -5,6 +5,7 @@ PYTHON = @PYTHON@
 
 SECRET_KEY = @SECRET_KEY@
 WEBUSER = @WEBUSER@
+DJANGO_DIR = @DJANGO_DIR@
 
 CFLAGS	= @CFLAGS@
 LDFLAGS = @LDFLAGS@ @POW_LDFLAGS@
@@ -192,8 +193,8 @@ COMPILE_SETTINGS = \
 	AC_MYRPKI='${DESTDIR}${sbindir}/myrpki' \
 	AC_LOCALSTATEDIR='${DESTDIR}${localstatedir}' \
 	AC_WEBUSER='${WEBUSER}' \
-	AC_TEMPLATE_DIR='${DESTDIR}${datarootdir}/rpki/gui/templates' \
 	AC_DATAROOTDIR='${DESTDIR}${datarootdir}' \
+	AC_DJANGO_DIR='${DJANGO_DIR}' \
 	${PYTHON} ${abs_top_srcdir}/buildtools/subst-vars.py <$? >$@
 
 rpki-sql-backup: rpki-sql-backup.py
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>
diff --git a/rpkid/rpki/gui/settings.py.in b/rpkid/rpki/gui/settings.py.in
index 898f7d31..243cef56 100644
--- a/rpkid/rpki/gui/settings.py.in
+++ b/rpkid/rpki/gui/settings.py.in
@@ -33,10 +33,6 @@ TEMPLATE_LOADERS = (
     'django.template.loaders.eggs.Loader'
 )
 
-TEMPLATE_DIRS = (
-    '%(AC_TEMPLATE_DIR)s',
-)
-
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
@@ -58,6 +54,7 @@ INSTALLED_APPS = (
     'django.contrib.admindocs',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
+    'django.contrib.staticfiles',
     'rpki.gui.app',
     'rpki.gui.cacheview'
 )
@@ -70,3 +67,8 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     "django.contrib.messages.context_processors.messages",
     "django.core.context_processors.request"
 )
+
+STATIC_URL = '/static/'
+STATIC_ROOT = '%(AC_DATAROOTDIR)s/rpki/gui/static'
+STATICFILES_DIRS = (("admin", "%(AC_DJANGO_DIR)s/contrib/admin/media"),)
+STATICFILES_FINDERS = ("django.contrib.staticfiles.finders.FileSystemFinder",)