From 6f9a00b15fe27c894a18e4daa5b01448589c2fe4 Mon Sep 17 00:00:00 2001 From: Michael Elkins Date: Mon, 24 Jan 2011 21:09:36 +0000 Subject: 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 --- portal-gui/scripts/adduser.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'portal-gui/scripts/adduser.py') 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 -- cgit v1.2.3