diff options
-rw-r--r-- | rpkid/rpki/gui/app/glue.py | 3 | ||||
-rw-r--r-- | rpkid/rpki/gui/app/settings.py.in | 22 | ||||
-rw-r--r-- | rpkid/rpki/gui/app/views.py | 3 |
3 files changed, 24 insertions, 4 deletions
diff --git a/rpkid/rpki/gui/app/glue.py b/rpkid/rpki/gui/app/glue.py index a00eff50..a26910d8 100644 --- a/rpkid/rpki/gui/app/glue.py +++ b/rpkid/rpki/gui/app/glue.py @@ -25,8 +25,7 @@ from django.db.models import F import rpki, rpki.async, rpki.http, rpki.x509, rpki.left_right from rpki.myrpki import CA, IRDB, csv_writer -from rpki.gui import settings -from rpki.gui.app import models +from rpki.gui.app import models, settings def conf(*handle): """ diff --git a/rpkid/rpki/gui/app/settings.py.in b/rpkid/rpki/gui/app/settings.py.in new file mode 100644 index 00000000..0ee436b7 --- /dev/null +++ b/rpkid/rpki/gui/app/settings.py.in @@ -0,0 +1,22 @@ +# $Id$ +# +# This module contains the default settings for the RPKI portal gui. +# +# DO NOT EDIT! This file is automatically generated from settings.py.in +# path to the myrpki command line tool + +from django.conf import settings + +MYRPKI = settings.MYRPKI if hasattr(settings, 'MYRPKI') else '%(AC_MYRPKI)s' + +# directory containing the resource handles served by the rpki portal gui +CONFDIR = settings.MYRPKI if hasattr(settings, 'CONFDIR') else '%(AC_LOCALSTATEDIR)s/rpki/conf' + +# maildir-style mailbox where uploaded requests are saved +INBOX = settings.MYRPKI if hasattr(settings, 'INBOX') else '%(AC_LOCALSTATEDIR)s/rpki/inbox' + +# maildir-style mailbox where responses to client requests are stored +OUTBOX = settings.MYRPKI if hasattr(settings, 'OUTBOX') else '%(AC_LOCALSTATEDIR)s/rpki/outbox' + +# uid the web server runs as +WEB_USER = settings.MYRPKI if hasattr(settings, 'WEB_USER') else '%(AC_WEBUSER)s' diff --git a/rpkid/rpki/gui/app/views.py b/rpkid/rpki/gui/app/views.py index db1cff3f..e1048e2a 100644 --- a/rpkid/rpki/gui/app/views.py +++ b/rpkid/rpki/gui/app/views.py @@ -26,10 +26,9 @@ from django.utils.http import urlquote from django.template import RequestContext from django import http from django.views.generic.list_detail import object_list -from django.conf import settings from django.core.urlresolvers import reverse -from rpki.gui.app import models, forms, glue, misc, AllocationTree +from rpki.gui.app import models, forms, glue, misc, AllocationTree, settings from rpki.gui.app.asnset import asnset debug = False |