diff options
author | Michael DeHaan <mdehaan@redhat.com> | 2008-02-25 16:59:13 -0500 |
---|---|---|
committer | Michael DeHaan <mdehaan@redhat.com> | 2008-02-25 16:59:13 -0500 |
commit | 2108f87ee704ac86f5a6b924c03afc86e0fa617d (patch) | |
tree | 9eaeba90f971d06d90a7288fd0c962214a28de79 /certmaster/certmaster.py | |
parent | 613a485c4798b38a65042e9d78968896c590fdd0 (diff) | |
download | certmaster-2108f87ee704ac86f5a6b924c03afc86e0fa617d.tar.gz certmaster-2108f87ee704ac86f5a6b924c03afc86e0fa617d.tar.xz certmaster-2108f87ee704ac86f5a6b924c03afc86e0fa617d.zip |
Find and replace
Diffstat (limited to 'certmaster/certmaster.py')
-rwxr-xr-x | certmaster/certmaster.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/certmaster/certmaster.py b/certmaster/certmaster.py index 9ebd66b..e1a7b36 100755 --- a/certmaster/certmaster.py +++ b/certmaster/certmaster.py @@ -25,7 +25,6 @@ import glob import socket import exceptions -#from func.server import codes import certs import codes import utils @@ -33,7 +32,7 @@ from config import read_config from commonconfig import CMConfig CERTMASTER_LISTEN_PORT = 51235 -CERTMASTER_CONFIG = "/etc/func/certmaster.conf" +CERTMASTER_CONFIG = "/etc/certmaster/certmaster.conf" class CertMaster(object): def __init__(self, conf_file=CERTMASTER_CONFIG): @@ -42,8 +41,8 @@ class CertMaster(object): usename = utils.get_hostname(talk_to_certmaster=False) mycn = '%s-CA-KEY' % usename - self.ca_key_file = '%s/funcmaster.key' % self.cfg.cadir - self.ca_cert_file = '%s/funcmaster.crt' % self.cfg.cadir + self.ca_key_file = '%s/certmaster.key' % self.cfg.cadir + self.ca_cert_file = '%s/certmaster.crt' % self.cfg.cadir try: if not os.path.exists(self.cfg.cadir): os.makedirs(self.cfg.cadir) @@ -230,7 +229,7 @@ def serve(xmlrpcinstance): def main(argv): - cm = CertMaster('/etc/func/certmaster.conf') + cm = CertMaster('/etc/certmaster/certmaster.conf') if "daemon" in argv or "--daemon" in argv: utils.daemonize("/var/run/certmaster.pid") |