31 files changed, 120 insertions, 127 deletions

diff --git a/buildtools/subst-vars.py b/buildtools/subst-vars.py
new file mode 100755
index 00000000..3e9ad039
--- /dev/null
+++ b/buildtools/subst-vars.py
@@ -0,0 +1,28 @@
+# $Id$
+
+"""
+Copyright (C) 2011  SPARTA, Inc., dba Cobham Analytic Solutions
+
+Permission to use, copy, modify, and distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+"""
+
+
+import os, sys
+
+# pull out all AC_* environment variables into a dict to substitute in the input file
+d = {}
+for v in os.environ:
+    if v.startswith('AC_'):
+        d[v] = os.environ[v]
+
+print sys.stdin.read() % d
diff --git a/portal-gui/Makefile.in b/portal-gui/Makefile.in
index b48f5d34..f8cb2012 100644
--- a/portal-gui/Makefile.in
+++ b/portal-gui/Makefile.in
@@ -17,24 +17,18 @@ libexecdir=@libexecdir@
 
 PYTHON=@PYTHON@
 WEBUSER=@WEBUSER@
-SECRET_KEY=@SECRET_KEY@
 
-INSTDIR=$(datarootdir)/rpki/gui
 CONFDIR=$(localstatedir)/rpki/conf
 DATABASE_PATH=$(localstatedir)/rpki/gui.db
-MEDIADIR=$(INSTDIR)/media
-MYRPKI=$(sbindir)/myrpki
+INSTDIR=$(datarootdir)/rpki/gui
 TEMPLATEDIR=$(INSTDIR)/templates
 
 # automatically built sources
-BUILD=rpkigui/settings.py \
-      rpkigui/urls.py \
-      rpkigui/myrpki/glue.py \
+BUILD=\
 	scripts/list_resources \
 	scripts/adduser \
 	scripts/load_csv \
-      apache/rpki.wsgi \
-      apache/rpki.conf
+	apache/rpki.conf
 
 all: $(BUILD)
 
@@ -46,28 +40,9 @@ distclean: clean
 	rm -f Makefile
 
 edit = sed \
-	     -e 's|@CONFDIR[@]|$(CONFDIR)|g' \
-	     -e 's|@DATABASE_PATH[@]|$(DATABASE_PATH)|g' \
-	     -e 's|@INSTDIR[@]|$(INSTDIR)|g' \
-	     -e 's|@MEDIADIR[@]|$(MEDIADIR)|g' \
-	     -e 's|@MYRPKI[@]|$(MYRPKI)|g' \
 	     -e 's|@PYTHON[@]|$(PYTHON)|g' \
-	     -e 's|@SECRET_KEY[@]|$(SECRET_KEY)|g' \
-	     -e 's|@TEMPLATEDIR[@]|$(TEMPLATEDIR)|g' \
 	     -e 's|@WEBUSER[@]|$(WEBUSER)|g'
 
-rpkigui/settings.py: $(srcdir)/rpkigui/settings.py.in Makefile
-	$(edit) $@.in > $@
-
-rpkigui/myrpki/glue.py: $(srcdir)/rpkigui/myrpki/glue.py.in Makefile
-	$(edit) $@.in > $@
-
-rpkigui/urls.py: $(srcdir)/rpkigui/urls.py.in Makefile
-	$(edit) $@.in > $@
-
-apache/rpki.wsgi: $(srcdir)/apache/rpki.wsgi.in Makefile
-	$(edit) $@.in > $@
-
 apache/rpki.conf: $(srcdir)/apache/rpki.conf.in Makefile
 	$(edit) $@.in > $@
 
@@ -80,23 +55,7 @@ scripts/load_csv: $(srcdir)/scripts/load_csv.py Makefile
 scripts/adduser: $(srcdir)/scripts/adduser.py Makefile
 	$(edit) $@.py > $@
 
-INSTALL_FILES=\
-	rpkigui/__init__.py \
-	rpkigui/manage.py \
-	rpkigui/settings.py \
-	rpkigui/urls.py \
-	rpkigui/myrpki/AllocationTree.py \
-	rpkigui/myrpki/__init__.py \
-	rpkigui/myrpki/admin.py \
-	rpkigui/myrpki/asnset.py \
-	rpkigui/myrpki/forms.py \
-	rpkigui/myrpki/glue.py \
-	rpkigui/myrpki/misc.py \
-	rpkigui/myrpki/models.py \
-	rpkigui/myrpki/urls.py \
-	rpkigui/myrpki/views.py
-
-.PHONY: install-perms install-data install install-media install-django install-scripts install-templates
+.PHONY: install-perms install-data install install-scripts install-templates
 
 install-perms:
 	chown $(WEBUSER) `dirname $(DATABASE_PATH)`
@@ -104,11 +63,6 @@ install-perms:
 	mkdir -p $(CONFDIR)
 	chown -R $(WEBUSER) $(CONFDIR)
 
-install-media:
-	install -m 755 -d $(INSTDIR)/media/img
-	install -m 644 media/img/my.png $(INSTDIR)/media/img
-	install -m 644 media/img/rpki.png $(INSTDIR)/media/img 
-
 install-apache:
 	install -d -m 755 $(INSTDIR)/apache
 	install -m 644 apache/rpki.conf $(INSTDIR)/apache
@@ -128,20 +82,20 @@ install-templates:
 	install -d -m 755 $(TEMPLATEDIR)/registration
 	install -m 644 templates/registration/login.html $(TEMPLATEDIR)/registration
 
-#this will go away once the django app moves into the rpki module
-install-django:
-	for f in $(INSTALL_FILES); do \
-		install -D -m 644 $$f $(INSTDIR)/$$f; \
-	done
-
 install-scripts:
 	# user scripts
 	install -m 755 scripts/load_csv $(sbindir)/rpkigui-load-csv
 	install -m 755 scripts/adduser $(sbindir)/rpkigui-add-user
 	install -D -m 755 scripts/list_resources $(libexecdir)/rpkigui-list-resources
 
-install-data: $(BUILD) install-apache install-media install-templates install-scripts install-django
+install-data: $(BUILD) install-apache install-templates install-scripts
 	mkdir -p `dirname $(DATABASE_PATH)`
-	cd $(INSTDIR)/rpkigui && $(PYTHON) manage.py syncdb
+	django-admin syncdb --settings rpki.gui.settings
 
 install: install-data install-perms
+
+uninstall:
+	rm -r $(INSTDIR)
+	rm $(sbindir)/rpkigui-load-csv
+	rm $(sbindir)/rpkigui-add-user
+	rm $(libexecdir)/rpkigui-list-resources
diff --git a/portal-gui/apache/rpki.wsgi.in b/portal-gui/apache/rpki.wsgi
index c50fa6b7..0a7797a7 100644
--- a/portal-gui/apache/rpki.wsgi.in
+++ b/portal-gui/apache/rpki.wsgi
@@ -1,6 +1,6 @@
 # $Id$
 """
-Copyright (C) 2010  SPARTA, Inc. dba Cobham Analytic Solutions
+Copyright (C) 2010, 2011  SPARTA, Inc. dba Cobham Analytic Solutions
 
 Permission to use, copy, modify, and distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
@@ -20,11 +20,8 @@ This is an example wsgi application for use with mod_wsgi and apache.
 """
 
 import os
-import sys
 
-os.environ['DJANGO_SETTINGS_MODULE'] = 'rpkigui.settings'
-
-sys.path.append('@INSTDIR@')
+os.environ['DJANGO_SETTINGS_MODULE'] = 'rpki.gui.settings'
 
 import django.core.handlers.wsgi
 application = django.core.handlers.wsgi.WSGIHandler()
diff --git a/portal-gui/scripts/adduser.py b/portal-gui/scripts/adduser.py
index 6d6f0c2c..20b395ea 100644
--- a/portal-gui/scripts/adduser.py
+++ b/portal-gui/scripts/adduser.py
@@ -22,13 +22,12 @@
 #
 # DO NOT EDIT!  This script is automatically generated from adduser.py
 
-import os, sys
-sys.path.append('@INSTDIR@')
-os.environ['DJANGO_SETTINGS_MODULE'] = 'rpkigui.settings'
+import os
+os.environ['DJANGO_SETTINGS_MODULE'] = 'rpki.gui.settings'
 
 from django.contrib.auth.models import User
 from django.conf import settings
-from rpkigui.myrpki.models import Conf
+from rpki.gui.app.models import Conf
 
 # The username that apache runs as.  This is required so that we can chown
 # the csv files that the portal-gui needs to write.
@@ -86,7 +85,7 @@ if __name__ == '__main__':
         print >>sys.stderr, '%s is self-hosted' % username
     conf.save()
     
-    myrpki_dir = '%s/%s' % (settings.MYRPKI_DATA_DIR, username)
+    myrpki_dir = '%s/%s' % (settings.CONFDIR, username)
     print 'myrpki_dir=', myrpki_dir
     if not os.path.exists(myrpki_dir):
 	print 'creating ', myrpki_dir
diff --git a/portal-gui/scripts/list_resources.py b/portal-gui/scripts/list_resources.py
index 54845563..b425facc 100644
--- a/portal-gui/scripts/list_resources.py
+++ b/portal-gui/scripts/list_resources.py
@@ -31,10 +31,9 @@
 #       later
 
 import sys
-sys.path.append('@INSTDIR@')
 
 import os
-os.environ['DJANGO_SETTINGS_MODULE'] = 'rpkigui.settings'
+os.environ['DJANGO_SETTINGS_MODULE'] = 'rpki.gui.settings'
 
 from datetime import datetime
 import getopt
@@ -48,7 +47,7 @@ import rpki.async
 import rpki.left_right
 import rpki.resource_set
 
-from rpkigui.myrpki import models
+from rpki.gui.app import models
 
 verbose = False
 version = '$Id$'
diff --git a/portal-gui/scripts/load_csv.py b/portal-gui/scripts/load_csv.py
index 29938b2d..f4738539 100755
--- a/portal-gui/scripts/load_csv.py
+++ b/portal-gui/scripts/load_csv.py
@@ -25,8 +25,7 @@
 #
 
 import sys, os
-sys.path.append('@INSTDIR@')
-os.environ['DJANGO_SETTINGS_MODULE'] = 'rpkigui.settings'
+os.environ['DJANGO_SETTINGS_MODULE'] = 'rpki.gui.settings'
 
 import csv
 import socket # for socket.error
@@ -36,8 +35,8 @@ import rpki.resource_set
 import rpki.ipaddrs
 from rpki.myrpki import csv_reader
 
-from rpkigui.myrpki import models
-from rpkigui.myrpki.views import add_roa_requests
+from rpki.gui.app import models
+from rpki.gui.app.views import add_roa_requests
 
 cfg_file = os.getenv("RPKI_CONF", "rpki.conf")
 cfg = rpki.config.parser(cfg_file, "myrpki")
diff --git a/portal-gui/scripts/roa_check.py b/portal-gui/scripts/roa_check.py
index b952c50f..c280d935 100755
--- a/portal-gui/scripts/roa_check.py
+++ b/portal-gui/scripts/roa_check.py
@@ -13,7 +13,7 @@ from rpki.resource_set import roa_prefix_set_ipv4, roa_prefix_set_ipv6
 from rpki.resource_set import resource_range_ipv4, resource_range_ipv6
 from rpki.ipaddrs import v4addr, v6addr
 
-from rpkigui.myrpki.models import Roa
+from rpki.gui.app.models import Roa
 
 # build up a list of all the authenticated roa's using the asn as the key
 roaiter = rcynic_xml_iterator(
diff --git a/portal-gui/templates/base.html b/portal-gui/templates/base.html
index 7645cf9f..a096cdca 100644
--- a/portal-gui/templates/base.html
+++ b/portal-gui/templates/base.html
@@ -8,8 +8,7 @@
 </head>
 <body>
     <div id="header">
-       <img src="/site_media/img/my.png"/>
-       <img src="/site_media/img/rpki.png"/>
+      <h1>RPKI Portal GUI</h1>
     </div>
     <div id="content">
        {% if user.is_authenticated %}
diff --git a/portal-gui/templates/myrpki/asn_view.html b/portal-gui/templates/myrpki/asn_view.html
index ef020355..d78237c5 100644
--- a/portal-gui/templates/myrpki/asn_view.html
+++ b/portal-gui/templates/myrpki/asn_view.html
@@ -7,7 +7,7 @@ td { border: solid 1px; text-align: center; padding-left: 1em; padding-right: 1e
 {% endblock %}
 
 {% block content %}
-<p>Handle: <a href="{% url rpkigui.myrpki.views.dashboard %}">{{ request.session.handle }}</a>
+<p>Handle: <a href="{% url rpki.gui.app.views.dashboard %}">{{ request.session.handle }}</a>
 
 <h1>ASN View</h1>
 
diff --git a/portal-gui/templates/myrpki/child_view.html b/portal-gui/templates/myrpki/child_view.html
index 62709f0d..0721cc65 100644
--- a/portal-gui/templates/myrpki/child_view.html
+++ b/portal-gui/templates/myrpki/child_view.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 {% block content %}
-<p>Handle: <a href="{% url rpkigui.myrpki.views.dashboard %}">{{ request.session.handle.handle }}</a>
+<p>Handle: <a href="{% url rpki.gui.app.views.dashboard %}">{{ request.session.handle.handle }}</a>
 <h1>Child View</h1>
 <p>Child: {{ child.handle }}
 
diff --git a/portal-gui/templates/myrpki/dashboard.html b/portal-gui/templates/myrpki/dashboard.html
index af99e89e..116ea792 100644
--- a/portal-gui/templates/myrpki/dashboard.html
+++ b/portal-gui/templates/myrpki/dashboard.html
@@ -8,8 +8,8 @@ td { border: solid 1px; text-align: center; padding-left: 1em; padding-right: 1e
 
 {% block content %}
 <p>Handle: {{ request.session.handle }}
-| <a href="{% url rpkigui.myrpki.views.conf_export %}">export identity</a>
-| <a href="{% url rpkigui.myrpki.views.conf_list %}">select</a>
+| <a href="{% url rpki.gui.app.views.conf_export %}">export identity</a>
+| <a href="{% url rpki.gui.app.views.conf_list %}">select</a>
 
 <div style="border: inset">
 <h1 style="text-align: center">Parents</h1>
@@ -54,7 +54,7 @@ td { border: solid 1px; text-align: center; padding-left: 1em; padding-right: 1e
 {% if request.session.handle.children.all %}
 <ul>
 {% for child in request.session.handle.children.all %}
-<li><a href="{% url rpkigui.myrpki.views.child_view child.handle %}">{{ child.handle }}</a>
+<li><a href="{% url rpki.gui.app.views.child_view child.handle %}">{{ child.handle }}</a>
 {% if child.address_range.count or child.asn.count %}
 <p>Delegated resources:
 <ul>
@@ -76,8 +76,8 @@ td { border: solid 1px; text-align: center; padding-left: 1em; padding-right: 1e
 {% endif %}
 
 <p>
-Export (csv): <a href="{% url rpkigui.myrpki.views.download_asns request.session.handle %}">asns</a> |
-<a href="{% url rpkigui.myrpki.views.download_prefixes request.session.handle %}">prefixes</a>
+Export (csv): <a href="{% url rpki.gui.app.views.download_asns request.session.handle %}">asns</a> |
+<a href="{% url rpki.gui.app.views.download_prefixes request.session.handle %}">prefixes</a>
 
 </div>
 
@@ -101,7 +101,7 @@ Export (csv): <a href="{% url rpkigui.myrpki.views.download_asns request.session
 {% endfor %}
 </table>
 
-<p><a href="{% url rpkigui.myrpki.views.download_roas request.session.handle %}">export (csv)</a>
+<p><a href="{% url rpki.gui.app.views.download_roas request.session.handle %}">export (csv)</a>
 
 </div><!-- roas -->
 
diff --git a/portal-gui/templates/myrpki/parent_view.html b/portal-gui/templates/myrpki/parent_view.html
index e1852245..13a9d848 100644
--- a/portal-gui/templates/myrpki/parent_view.html
+++ b/portal-gui/templates/myrpki/parent_view.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 {% block content %}
-<p>Handle: <a href="{% url rpkigui.myrpki.views.dashboard %}">{{ request.session.handle.handle }}</a>
+<p>Handle: <a href="{% url rpki.gui.app.views.dashboard %}">{{ request.session.handle.handle }}</a>
 <h1>Parent View</h1>
 <p>Parent: {{ parent.handle }}
 <h2>Delegated Addresses</h2>
diff --git a/portal-gui/templates/myrpki/prefix_view.html b/portal-gui/templates/myrpki/prefix_view.html
index 1e1ca797..aabc0a39 100644
--- a/portal-gui/templates/myrpki/prefix_view.html
+++ b/portal-gui/templates/myrpki/prefix_view.html
@@ -7,7 +7,7 @@ td { border: solid 1px; text-align: center; padding-left: 1em; padding-right: 1e
 {% endblock %}
 
 {% block content %}
-<p>Handle: <a href="{% url rpkigui.myrpki.views.dashboard %}">{{ request.session.handle }}</a>
+<p>Handle: <a href="{% url rpki.gui.app.views.dashboard %}">{{ request.session.handle }}</a>
 
 <h1>Prefix View</h1>
 
diff --git a/rpkid/Makefile.in b/rpkid/Makefile.in
index 81fce16b..a992cc17 100644
--- a/rpkid/Makefile.in
+++ b/rpkid/Makefile.in
@@ -4,6 +4,8 @@ PYTHON = @PYTHON@
 PYWRAP = @PYWRAP@
 PYWRAP_CMD = @PYWRAP_CMD@
 
+SECRET_KEY = @SECRET_KEY@
+
 CFLAGS	= @CFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS	= @LIBS@
@@ -22,6 +24,7 @@ libexecdir	= @libexecdir@
 abs_builddir	= @abs_builddir@
 abs_top_srcdir	= @abs_top_srcdir@
 abs_top_builddir= @abs_top_builddir@
+srcdir          = @srcdir@
 
 SETUP_PY = \
 	AC_CFLAGS='${CFLAGS}' \
@@ -34,7 +37,7 @@ SETUP_PY = \
 
 POW_SO	= rpki/POW/_POW.so
 
-SCRIPTS = rpki-sql-backup rpki-sql-setup rpki-start-servers irbe_cli irdbd myrpki pubd rootd rpkid
+SCRIPTS = rpki-sql-backup rpki-sql-setup rpki-start-servers irbe_cli irdbd myrpki pubd rootd rpkid rpki/gui/settings.py
 
 all: ${POW_SO} rpki/relaxng.py myrpki.rng ${SCRIPTS}
 
@@ -166,6 +169,13 @@ distclean:: clean docclean
 COMPILE_COMMON = AC_RPKI_CONFIG_DIR='${sysconfdir}' ${PYTHON} ${abs_top_srcdir}/buildtools/make-python-executable.py <$? >$@; chmod 555 $@
 COMPILE_PYTHON = AC_PYTHON_INTERPRETER='${PYTHON}' ${COMPILE_COMMON}
 COMPILE_PYWRAP = AC_PYTHON_INTERPRETER='${PYWRAP}' ${COMPILE_COMMON}
+COMPILE_SETTINGS = \
+		   AC_DATABASE_PATH='${localstatedir}/rpki/gui.db' \
+		   AC_TEMPLATE_DIR=${datarootdir}/rpki/gui/templates \
+		   AC_SECRET_KEY='${SECRET_KEY}' \
+		   AC_MYRPKI='${sbindir}/myrpki' \
+		   AC_CONFDIR='${localstatedir}/rpki/conf' \
+		   ${PYTHON} ${abs_top_srcdir}/buildtools/subst-vars.py <$? >$@; chmod 555 $@
 
 rpki-sql-backup: rpki-sql-backup.py
 	${COMPILE_PYTHON}
@@ -193,3 +203,7 @@ rootd: rootd.py
 
 rpkid: rpkid.py
 	${COMPILE_PYWRAP}
+
+rpki/gui/settings.py: ${srcdir}/rpki/gui/settings.py.in
+	rm -f $@
+	${COMPILE_SETTINGS}
diff --git a/portal-gui/rpkigui/TODO b/rpkid/rpki/gui/TODO
index b7136397..b7136397 100644
--- a/portal-gui/rpkigui/TODO
+++ b/rpkid/rpki/gui/TODO
diff --git a/portal-gui/rpkigui/__init__.py b/rpkid/rpki/gui/__init__.py
index e69de29b..e69de29b 100644
--- a/portal-gui/rpkigui/__init__.py
+++ b/rpkid/rpki/gui/__init__.py
diff --git a/portal-gui/rpkigui/myrpki/AllocationTree.py b/rpkid/rpki/gui/app/AllocationTree.py
index 13936797..73277234 100644
--- a/portal-gui/rpkigui/myrpki/AllocationTree.py
+++ b/rpkid/rpki/gui/app/AllocationTree.py
@@ -1,6 +1,6 @@
 # $Id$
 """
-Copyright (C) 2010  SPARTA, Inc. dba Cobham Analytic Solutions
+Copyright (C) 2010, 2011  SPARTA, Inc. dba Cobham Analytic Solutions
 
 Permission to use, copy, modify, and distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
@@ -15,7 +15,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 """
 
-from rpkigui.myrpki import misc, models
+from rpki.gui.app import misc, models
 from rpki import resource_set
 
 class AllocationTree(object):
diff --git a/portal-gui/rpkigui/myrpki/__init__.py b/rpkid/rpki/gui/app/__init__.py
index e69de29b..e69de29b 100644
--- a/portal-gui/rpkigui/myrpki/__init__.py
+++ b/rpkid/rpki/gui/app/__init__.py
diff --git a/portal-gui/rpkigui/myrpki/admin.py b/rpkid/rpki/gui/app/admin.py
index b5d7ab66..f4134214 100644
--- a/portal-gui/rpkigui/myrpki/admin.py
+++ b/rpkid/rpki/gui/app/admin.py
@@ -1,5 +1,7 @@
 """
-Copyright (C) 2010  SPARTA, Inc. dba Cobham Analytic Solutions
+$Id$
+
+Copyright (C) 2010, 2011  SPARTA, Inc. dba Cobham Analytic Solutions
 
 Permission to use, copy, modify, and distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
@@ -16,7 +18,7 @@ PERFORMANCE OF THIS SOFTWARE.
 
 from django import forms
 from django.contrib import admin
-from rpkigui.myrpki import models
+from rpki.gui.app import models
 
 class ConfAdmin( admin.ModelAdmin ):
     pass
diff --git a/portal-gui/rpkigui/myrpki/asnset.py b/rpkid/rpki/gui/app/asnset.py
index 6a2d562c..6a2d562c 100644
--- a/portal-gui/rpkigui/myrpki/asnset.py
+++ b/rpkid/rpki/gui/app/asnset.py
diff --git a/portal-gui/rpkigui/myrpki/forms.py b/rpkid/rpki/gui/app/forms.py
index 959d5a20..f7f51936 100644
--- a/portal-gui/rpkigui/myrpki/forms.py
+++ b/rpkid/rpki/gui/app/forms.py
@@ -1,6 +1,6 @@
 # $Id$
 """
-Copyright (C) 2010  SPARTA, Inc. dba Cobham Analytic Solutions
+Copyright (C) 2010, 2011  SPARTA, Inc. dba Cobham Analytic Solutions
 
 Permission to use, copy, modify, and distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
@@ -19,8 +19,8 @@ from django import forms
 
 import rpki.ipaddrs
 
-from rpkigui.myrpki import models, misc
-from rpkigui.myrpki.asnset import asnset
+from rpki.gui.app import models, misc
+from rpki.gui.app.asnset import asnset
 
 class AddConfForm(forms.Form):
     handle = forms.CharField(required=True,
diff --git a/portal-gui/rpkigui/myrpki/glue.py.in b/rpkid/rpki/gui/app/glue.py
index 897b23d4..0204ff9e 100644
--- a/portal-gui/rpkigui/myrpki/glue.py.in
+++ b/rpkid/rpki/gui/app/glue.py
@@ -1,5 +1,6 @@
+# $Id$
 """
-Copyright (C) 2010  SPARTA, Inc. dba Cobham Analytic Solutions
+Copyright (C) 2010, 2011  SPARTA, Inc. dba Cobham Analytic Solutions
 
 Permission to use, copy, modify, and distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
@@ -29,12 +30,11 @@ from django.db.models import F
 import rpki
 import rpki.config
 
-from rpkigui.myrpki import models
-
-confdir = '@CONFDIR@'
+from rpki.gui import settings
+from rpki.gui.app import models
 
 def conf(handle):
-    return confdir + '/' + handle
+    return settings.CONFDIR + '/' + handle
 
 #def form_to_conf(data):
 #    """Write out a rpki.conf based on the given form data."""
@@ -55,7 +55,7 @@ def invoke_rpki(handle, args):
     myrpki_dir = confdir(handle)
     config = myrpki_dir + '/rpki.conf'
     # default rpki.conf uses relative paths, so chdir() to the repo first
-    cmd = 'cd %s && @MYRPKI@ %s' % (myrpki_dir, ' '.join(['--config=' + config] + args))
+    cmd = 'cd %s && %s %s' % (settings.MYRPKI, myrpki_dir, ' '.join(['--config=' + config] + args))
     print >>sys.stderr, 'invoking', cmd
     os.system(cmd)
 
diff --git a/portal-gui/rpkigui/myrpki/misc.py b/rpkid/rpki/gui/app/misc.py
index 5d3cba93..5d3cba93 100644
--- a/portal-gui/rpkigui/myrpki/misc.py
+++ b/rpkid/rpki/gui/app/misc.py
diff --git a/portal-gui/rpkigui/myrpki/models.py b/rpkid/rpki/gui/app/models.py
index 7db5ef1d..0efcd5ba 100644
--- a/portal-gui/rpkigui/myrpki/models.py
+++ b/rpkid/rpki/gui/app/models.py
@@ -20,7 +20,7 @@ import socket
 from django.db import models
 from django.contrib.auth.models import User
 
-from rpkigui.myrpki.misc import str_to_range
+from rpki.gui.app.misc import str_to_range
 
 import rpki.resource_set
 import rpki.exceptions
@@ -73,7 +73,7 @@ class AddressRange(models.Model):
 
     @models.permalink
     def get_absolute_url(self):
-        return ('rpkigui.myrpki.views.address_view', [str(self.pk)])
+        return ('rpki.gui.app.views.address_view', [str(self.pk)])
 
     def as_resource_range(self):
         '''Convert to rpki.resource_set.resource_range_ip.'''
@@ -127,7 +127,7 @@ class Asn(models.Model):
 
     @models.permalink
     def get_absolute_url(self):
-        return ('rpkigui.myrpki.views.asn_view', [str(self.pk)])
+        return ('rpki.gui.app.views.asn_view', [str(self.pk)])
 
     def as_resource_range(self):
         # we force conversion to long() here because resource_range_as() wants
@@ -144,7 +144,7 @@ class Child(models.Model):
 
     @models.permalink
     def get_absolute_url(self):
-        return ('rpkigui.myrpki.views.child_view', [self.handle])
+        return ('rpki.gui.app.views.child_view', [self.handle])
 
     class Meta:
 	verbose_name_plural = "children"
@@ -160,7 +160,7 @@ class Parent(models.Model):
 
     @models.permalink
     def get_absolute_url(self):
-        return ('rpkigui.myrpki.views.parent_view', [self.handle])
+        return ('rpki.gui.app.views.parent_view', [self.handle])
 
     class Meta:
         # parents of a specific configuration should be unique
diff --git a/portal-gui/rpkigui/myrpki/urls.py b/rpkid/rpki/gui/app/urls.py
index 96d93e2d..24b311e5 100644
--- a/portal-gui/rpkigui/myrpki/urls.py
+++ b/rpkid/rpki/gui/app/urls.py
@@ -1,6 +1,6 @@
 # $Id$
 """
-Copyright (C) 2010  SPARTA, Inc. dba Cobham Analytic Solutions
+Copyright (C) 2010, 2011  SPARTA, Inc. dba Cobham Analytic Solutions
 
 Permission to use, copy, modify, and distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
@@ -17,7 +17,7 @@ PERFORMANCE OF THIS SOFTWARE.
 
 from django.conf.urls.defaults import *
 from django.views.generic.list_detail import object_list
-from rpkigui.myrpki import views
+from rpki.gui.app import views
 
 urlpatterns = patterns('',
     (r'^$', views.dashboard),
diff --git a/portal-gui/rpkigui/myrpki/views.py b/rpkid/rpki/gui/app/views.py
index f15ebbdd..6929ab36 100644
--- a/portal-gui/rpkigui/myrpki/views.py
+++ b/rpkid/rpki/gui/app/views.py
@@ -32,8 +32,8 @@ from django.views.decorators.csrf import csrf_exempt
 from django.conf import settings
 from django.core.urlresolvers import reverse
 
-from rpkigui.myrpki import models, forms, glue, misc, AllocationTree
-from rpkigui.myrpki.asnset import asnset
+from rpki.gui.app import models, forms, glue, misc, AllocationTree
+from rpki.gui.app.asnset import asnset
 
 debug = False
 
diff --git a/portal-gui/rpkigui/manage.py b/rpkid/rpki/gui/manage.py
index 5e78ea97..5e78ea97 100644
--- a/portal-gui/rpkigui/manage.py
+++ b/rpkid/rpki/gui/manage.py
diff --git a/portal-gui/rpkigui/settings.py.in b/rpkid/rpki/gui/settings.py.in
index ef7d4541..ed1525ae 100644
--- a/portal-gui/rpkigui/settings.py.in
+++ b/rpkid/rpki/gui/settings.py.in
@@ -1,7 +1,8 @@
 # $Id$
 #
-# Django settings for rpkigui project.
+# Django settings for the rpki portal-gui
 #
+# DO NOT EDIT!  This file is automatically generated from settings.py.in
 
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
@@ -13,7 +14,7 @@ ADMINS = (
 MANAGERS = ADMINS
 
 DATABASE_ENGINE = 'sqlite3'    # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
-DATABASE_NAME = '@DATABASE_PATH@'  # Or path to database file if using sqlite3.
+DATABASE_NAME = '%(AC_DATABASE_PATH)s'  # 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.
@@ -51,7 +52,7 @@ MEDIA_URL = ''
 ADMIN_MEDIA_PREFIX = '/media/'
 
 # Make this unique, and don't share it with anybody.
-SECRET_KEY = '@SECRET_KEY@'
+SECRET_KEY = '%(AC_SECRET_KEY)s'
 
 # List of callables that know how to import templates from various sources.
 TEMPLATE_LOADERS = (
@@ -72,13 +73,13 @@ MIDDLEWARE_CLASSES = (
     'django.middleware.csrf.CsrfMiddleware',
 )
 
-ROOT_URLCONF = 'rpkigui.urls'
+ROOT_URLCONF = 'rpki.gui.urls'
 
 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.
-    '@TEMPLATEDIR@'
+    '%(AC_TEMPLATE_DIR)s'
 )
 
 INSTALLED_APPS = (
@@ -88,7 +89,7 @@ INSTALLED_APPS = (
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.sites',
-    'rpkigui.myrpki'
+    'rpki.gui.app'
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (
@@ -104,4 +105,10 @@ AUTHENTICATION_BACKENDS = (
 )
 
 # where to redirect from /accounts/login/ after successful authentication
-LOGIN_REDIRECT_URL = '/myrpki/'
+LOGIN_REDIRECT_URL = '/rpki/'
+
+# path to the myrpki command line tool
+MYRPKI = '%(AC_MYRPKI)s'
+
+# directory containing the resource handles served by the rpki portal gui
+CONFDIR = '%(AC_CONFDIR)s'
diff --git a/portal-gui/rpkigui/urls.py.in b/rpkid/rpki/gui/urls.py
index bd32090a..e5f55cb5 100644
--- a/portal-gui/rpkigui/urls.py.in
+++ b/rpkid/rpki/gui/urls.py
@@ -23,8 +23,6 @@ from django.contrib import admin
 admin.autodiscover()
 
 urlpatterns = patterns('',
-    # Example:
-    # (r'^foo/', include('foo.foo.urls')),
 
     # Uncomment the admin/doc line below and add 'django.contrib.admindocs' 
     # to INSTALLED_APPS to enable admin documentation:
@@ -33,12 +31,9 @@ urlpatterns = patterns('',
     # Uncomment the next line to enable the admin:
     (r'^admin/', include(admin.site.urls)),
 
-    (r'^myrpki/', include('rpkigui.myrpki.urls')),
+    (r'^rpki/', include('rpki.gui.app.urls')),
 
     (r'^accounts/login/$', 'django.contrib.auth.views.login'),
     (r'^accounts/logout/$', 'django.contrib.auth.views.logout',
-        { 'next_page': '/myrpki/' }),
-
-    (r'^site_media/(?P<path>.*)$', 'django.views.static.serve',
-        {'document_root': '@MEDIADIR@'})
+        { 'next_page': '/rpki/' }),
 )
diff --git a/rpkid/setup.py b/rpkid/setup.py
index 131c2f56..5bada734 100644
--- a/rpkid/setup.py
+++ b/rpkid/setup.py
@@ -48,6 +48,6 @@ setup(name              = "rpkitoolkit",
       description       = "RPKI Toolkit",
       license           = "BSD",
       url               = "http://www.rpki.net/",
-      packages          = ["rpki", "rpki.POW"],
+      packages          = ["rpki", "rpki.POW", "rpki.gui", "rpki.gui.app" ],
       ext_modules       = [pow],
       data_files	= [(ac_sbindir, scripts)])
diff --git a/scripts/rpkidemo b/scripts/rpkidemo
index eef37834..a304e46f 100755
--- a/scripts/rpkidemo
+++ b/scripts/rpkidemo
@@ -166,7 +166,7 @@ class main(object):
 
   base_url = "https://demo.rpki.net/"
   auth_url = base_url + 'accounts/login/'
-  myrpki_url = base_url + 'myrpki/'
+  myrpki_url = base_url + 'rpki/'
   example_myrpki_cfg = "%s/rpkid/examples/rpki.conf" % top
   working_dir = "%s/rpkidemo-data" % cwd
   myrpki_py = "%s/rpkid/myrpki.py" % top