3 files changed, 18 insertions, 15 deletions
diff --git a/portal-gui/rpkigui/myrpki/glue.py b/portal-gui/rpkigui/myrpki/glue.py
index e092820a..bd234c26 100644
--- a/portal-gui/rpkigui/myrpki/glue.py
+++ b/portal-gui/rpkigui/myrpki/glue.py
@@ -33,7 +33,7 @@ def invoke_rpki(handle, args):
     config = settings.MYRPKI_DATA_DIR + '/' + handle + '/myrpki.conf'
     # default myrpki.conf uses relative paths, so chdir() to the repo first
     os.chdir(settings.MYRPKI_DATA_DIR + '/' + handle)
-    cmd = 'python ' + settings.MYRPKI_SRC_DIR + '/myrpki.py ' + ' '.join(['--config=' + config] + args)
+    cmd = 'python ' + settings.MYRPKI_PATH + ' '.join(['--config=' + config] + args)
     print 'invoking', cmd
     os.system(cmd)
 
diff --git a/portal-gui/rpkigui/settings.py b/portal-gui/rpkigui/settings.py.in
index d4e662dd..a84e92f4 100644
--- a/portal-gui/rpkigui/settings.py
+++ b/portal-gui/rpkigui/settings.py.in
@@ -1,6 +1,8 @@
 # $Id$
 #
 # Django settings for rpkigui project.
+#
+# @configure_input@
 
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
@@ -11,8 +13,8 @@ ADMINS = (
 
 MANAGERS = ADMINS
 
-DATABASE_ENGINE = 'sqlite3'           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
-DATABASE_NAME = '/home/melkins/myrpki/rpkiop'             # Or path to database file if using sqlite3.
+DATABASE_ENGINE = 'sqlite3'    # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+DATABASE_NAME = '@DATABASE_PATH@'  # Or path to database file if using sqlite3.
 DATABASE_USER = ''             # Not used with sqlite3.
 DATABASE_PASSWORD = ''         # Not used with sqlite3.
 DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
@@ -50,7 +52,7 @@ MEDIA_URL = ''
 ADMIN_MEDIA_PREFIX = '/media/'
 
 # Make this unique, and don't share it with anybody.
-SECRET_KEY = '81d$t*$7hr!&*s6*-@)_b6@(*%3eo82zu342vssj6x4&_(m_+s'
+SECRET_KEY = '@SECRET_KEY@'
 
 # List of callables that know how to import templates from various sources.
 TEMPLATE_LOADERS = (
@@ -73,8 +75,7 @@ TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
-#XXX
-	'/home/melkins/src/rpki/portal-gui/rpkigui/templates',
+    '@TEMPLATEDIR@'
 )
 
 INSTALLED_APPS = (
@@ -84,7 +85,7 @@ INSTALLED_APPS = (
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.sites',
-    'rpkigui.myrpki',
+    'rpkigui.myrpki'
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (
@@ -92,7 +93,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     "django.core.context_processors.debug",
     "django.core.context_processors.i18n",
     "django.core.context_processors.media",
-    "django.core.context_processors.request",
+    "django.core.context_processors.request"
 )
 
 LOGIN_REDIRECT_URL='/myrpki/'
@@ -101,8 +102,9 @@ LOGIN_REDIRECT_URL='/myrpki/'
 # RPKI GUI specific
 #
 
-# Top of directory tree where myrpki.conf, etc are stored for each resource holder
-MYRPKI_DATA_DIR = '/home/melkins/myrpki'
+# Top of directory tree where myrpki.conf, etc are stored for each
+# resource holder.
+MYRPKI_DATA_DIR = '@CONFDIR@'
 
-# where to find the myrpki.py command line tool
-MYRPKI_SRC_DIR = '/home/melkins/src/rpki/rpkid'
+# Where to find the myrpki.py command line tool.
+MYRPKI_PATH = '@MYRPKI_TOOL@'
diff --git a/portal-gui/rpkigui/urls.py b/portal-gui/rpkigui/urls.py.in
index 09d71e00..127463dc 100644
--- a/portal-gui/rpkigui/urls.py
+++ b/portal-gui/rpkigui/urls.py.in
@@ -1,4 +1,6 @@
 # $Id$
+#
+# @configure_input@
 
 from django.conf.urls.defaults import *
 
@@ -22,7 +24,6 @@ urlpatterns = patterns('',
     (r'^accounts/logout/$', 'django.contrib.auth.views.logout',
         { 'next_page': '/myrpki/' }),
 
-#XXX
-(r'^site_media/(?P<path>.*)$', 'django.views.static.serve',
-        {'document_root': '/home/melkins/src/rpki/portal-gui/media/'})
+    (r'^site_media/(?P<path>.*)$', 'django.views.static.serve',
+        {'document_root': '@MEDIADIR@'})
 )