From b6782b8cb518f203625e8de5dcb00c10826e4ba6 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Wed, 9 Dec 2009 21:34:03 +0000 Subject: [PATCH] use corrct config_dir --- sfa/server/sfa_component_setup.py | 3 ++- sfa/util/config.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sfa/server/sfa_component_setup.py b/sfa/server/sfa_component_setup.py index 67fe52aa..4255f818 100755 --- a/sfa/server/sfa_component_setup.py +++ b/sfa/server/sfa_component_setup.py @@ -120,7 +120,8 @@ def get_trusted_certs(registry=None, verbose=False): """ # define useful variables config = Config() - data_dir = config.data_path + data_dir = config.SFA_DATA_DIR + config_dir = config.SFA_CONFIG_DIR trusted_certs_dir = config.get_trustedroots_dir() keyfile = data_dir + os.sep + "server.key" certfile = data_dir + os.sep + "server.cert" diff --git a/sfa/util/config.py b/sfa/util/config.py index 929b8994..02ad5d3c 100644 --- a/sfa/util/config.py +++ b/sfa/util/config.py @@ -40,6 +40,7 @@ class Config: self.config_file = config_file # path to configuration data self.config_path = os.path.dirname(config_file) + # path to server data if not hasattr(self, 'SFA_DATA_DIR'): # default to /var/lib/sfa not specified in config -- 2.43.0