7 files changed, 95 insertions, 17 deletions
diff --git a/rpkid/portal-gui/Makefile.in b/rpkid/portal-gui/Makefile.in
index 946e877c..24341ed4 100644
--- a/rpkid/portal-gui/Makefile.in
+++ b/rpkid/portal-gui/Makefile.in
@@ -14,6 +14,7 @@ sharedstatedir=@sharedstatedir@
 bindir=@bindir@
 sbindir=@sbindir@
 libexecdir=@libexecdir@
+sysconfdir=@sysconfdir@
 
 WEBUSER=@WEBUSER@
 DJANGO_ADMIN=@DJANGO_ADMIN@
@@ -26,6 +27,7 @@ CONFDIR=${DESTDIR}$(localstatedir)/rpki/conf
 DATABASE_PATH=${DESTDIR}$(localstatedir)/rpki/gui.db
 INSTDIR=${DESTDIR}$(datarootdir)/rpki/gui
 STATIC_DIR=${INSTDIR}/static
+PYTHONPATH=${DESTDIR}${sysconfdir}/rpki
 
 # automatically built sources
 BUILD=apache/rpki.conf
@@ -62,8 +64,13 @@ 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
+	mkdir -p ${PYTHONPATH}
+	# FIXME should eventually try to merge new settings?
+	if [ ! -f ${PYTHONPATH}/settings.py ]; then \
+	    ${INSTALL} -m 644 settings.py ${PYTHONPATH}; \
+	fi
+	$(DJANGO_ADMIN) syncdb --pythonpath ${PYTHONPATH} --settings settings
+	$(DJANGO_ADMIN) collectstatic --noinput --pythonpath ${PYTHONPATH} --settings settings
 	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.wsgi b/rpkid/portal-gui/apache/rpki.wsgi.in
index 0a7797a7..8cddef95 100644
--- a/rpkid/portal-gui/apache/rpki.wsgi
+++ b/rpkid/portal-gui/apache/rpki.wsgi.in
@@ -19,9 +19,5 @@ This is an example wsgi application for use with mod_wsgi and apache.
 
 """
 
-import os
-
-os.environ['DJANGO_SETTINGS_MODULE'] = 'rpki.gui.settings'
-
 import django.core.handlers.wsgi
 application = django.core.handlers.wsgi.WSGIHandler()
diff --git a/rpkid/portal-gui/manage.py b/rpkid/portal-gui/manage.py
new file mode 100644
index 00000000..5e78ea97
--- /dev/null
+++ b/rpkid/portal-gui/manage.py
@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+from django.core.management import execute_manager
+try:
+    import settings # Assumed to be in the same directory.
+except ImportError:
+    import sys
+    sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)
+    sys.exit(1)
+
+if __name__ == "__main__":
+    execute_manager(settings)
diff --git a/rpkid/portal-gui/scripts/adduser.py b/rpkid/portal-gui/scripts/adduser.py
index 5ce8ab76..b06c6bc4 100644
--- a/rpkid/portal-gui/scripts/adduser.py
+++ b/rpkid/portal-gui/scripts/adduser.py
@@ -20,15 +20,10 @@
 #
 # DO NOT EDIT!  This script is automatically generated from adduser.py
 
-import os
-os.environ['DJANGO_SETTINGS_MODULE'] = 'rpki.gui.settings'
-
 from django.contrib.auth.models import User
 from rpki.gui.app import settings
 from rpki.gui.app.models import Conf
 
-import os
-import sys
 import getpass
 import pwd
 
diff --git a/rpkid/portal-gui/scripts/load_csv.py b/rpkid/portal-gui/scripts/load_csv.py
index 44d08829..9d4fc1ac 100755
--- a/rpkid/portal-gui/scripts/load_csv.py
+++ b/rpkid/portal-gui/scripts/load_csv.py
@@ -23,9 +23,6 @@
 # for the handle you are loading data
 #
 
-import os
-os.environ['DJANGO_SETTINGS_MODULE'] = 'rpki.gui.settings'
-
 import csv
 import socket # for socket.error
 
diff --git a/rpkid/portal-gui/scripts/rpkigui-rcynic.py b/rpkid/portal-gui/scripts/rpkigui-rcynic.py
index c7a0136e..3dc0d9bd 100644
--- a/rpkid/portal-gui/scripts/rpkigui-rcynic.py
+++ b/rpkid/portal-gui/scripts/rpkigui-rcynic.py
@@ -17,9 +17,7 @@
 default_logfile = '/var/rcynic/data/summary.xml'
 default_root = '/var/rcynic/data'
 
-import os, sys, time, vobject
-os.environ['DJANGO_SETTINGS_MODULE'] = 'rpki.gui.settings'
-
+import time, vobject
 from rpki.gui.cacheview import models
 from rpki.rcynic import rcynic_xml_iterator, label_iterator
 from rpki.sundial import datetime
diff --git a/rpkid/portal-gui/settings.py.in b/rpkid/portal-gui/settings.py.in
new file mode 100644
index 00000000..243cef56
--- /dev/null
+++ b/rpkid/portal-gui/settings.py.in
@@ -0,0 +1,74 @@
+# $Id$
+#
+# Sample Django settings.py for running the RPKI portal gui.  This
+# template was written for Django 1.2.
+#
+# DO NOT EDIT!  This file is automatically generated from
+# settings.py.in
+
+DEBUG = True
+TEMPLATE_DEBUG = DEBUG
+
+DATABASES = {
+  'default' : {
+    'ENGINE': 'django.db.backends.sqlite3',
+    'NAME'  : '%(AC_DATABASE_PATH)s'
+  }
+}
+
+# Local time zone for this installation. Choices can be found here:
+# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
+# although not all choices may be available on all operating systems.
+# If running in a Windows environment this must be set to the same as your
+# system time zone.
+TIME_ZONE = 'GMT'
+
+# Make this unique, and don't share it with anybody.
+SECRET_KEY = '%(AC_SECRET_KEY)s'
+
+# List of callables that know how to import templates from various sources.
+TEMPLATE_LOADERS = (
+    'django.template.loaders.filesystem.Loader',
+    'django.template.loaders.app_directories.Loader',
+    'django.template.loaders.eggs.Loader'
+)
+
+MIDDLEWARE_CLASSES = (
+    'django.middleware.common.CommonMiddleware',
+    'django.contrib.sessions.middleware.SessionMiddleware',
+
+    # order is important here.  if csrfmidware is put before condgetmidware,
+    # the returned pages get truncated for some reason!
+    'django.middleware.http.ConditionalGetMiddleware',
+
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware'
+)
+
+ROOT_URLCONF = 'rpki.gui.urls'
+
+INSTALLED_APPS = (
+    'django.contrib.auth',
+    'django.contrib.admin',
+    'django.contrib.admindocs',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.staticfiles',
+    'rpki.gui.app',
+    'rpki.gui.cacheview'
+)
+
+TEMPLATE_CONTEXT_PROCESSORS = (
+    "django.contrib.auth.context_processors.auth",
+    "django.core.context_processors.debug",
+    "django.core.context_processors.i18n",
+    "django.core.context_processors.media",
+    "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",)