diff options
Diffstat (limited to 'rpkid/rpki')
| -rw-r--r-- | rpkid/rpki/config.py | 6 | ||||
| -rw-r--r-- | rpkid/rpki/gui/script_util.py | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/rpkid/rpki/config.py b/rpkid/rpki/config.py index cc5b6580..99e6ef3b 100644 --- a/rpkid/rpki/config.py +++ b/rpkid/rpki/config.py @@ -47,7 +47,11 @@ default_filename = "rpki.conf" # if no global config file. Autoconf-generated code may set this to a # non-None value during script startup. -default_dirname = None +try: + import rpki.autoconf + default_dirname = rpki.autoconf.sysconfdir +except ImportError: + default_dirname = None ## @var default_envname # Name of environment variable containing config file name. diff --git a/rpkid/rpki/gui/script_util.py b/rpkid/rpki/gui/script_util.py index bb0fb427..c3a864fd 100644 --- a/rpkid/rpki/gui/script_util.py +++ b/rpkid/rpki/gui/script_util.py @@ -19,7 +19,7 @@ This module contains utility functions for use in standalone scripts. from django.conf import settings from rpki import config -from rpki.gui import autoconf +from rpki import autoconf __version__ = '$Id$' @@ -28,7 +28,6 @@ def setup(): """ Configure Django enough to use the ORM. """ - config.default_dirname = autoconf.sysconfdir cfg = config.parser(section='web_portal') # INSTALLED_APPS doesn't seem necessary so long as you are only accessing # existing tables. |