diff options
author | Michael Elkins <melkins@tislabs.com> | 2013-04-03 21:46:33 +0000 |
---|---|---|
committer | Michael Elkins <melkins@tislabs.com> | 2013-04-03 21:46:33 +0000 |
commit | 3f0a32b5756d9c76305de6225bbeb92601e9170c (patch) | |
tree | 2443c8fc70530ec62a69bcb88ebe3dc6ea3c8b5e /rpkid/rpki/config.py | |
parent | f10d649b294eafa7f3146f81edc48aed16e7bb9d (diff) |
merge /trunk
svn path=/branches/tk500/; revision=5263
Diffstat (limited to 'rpkid/rpki/config.py')
-rw-r--r-- | rpkid/rpki/config.py | 6 |
1 files changed, 5 insertions, 1 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. |