move portal-gui django app to $top/rpkid/rpki/gui

change dashboard url to /rpki/

put myrpki cli path and confdir into settings.py rather than generating glue.py at build time

don't use the old myrpki images on the dashboard

no longer need to include the portal-gui python module in sys.path since it is installed in site-packages

svn path=/buildtools/subst-vars.py; revision=3646

4 files changed, 10 insertions, 13 deletions

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(