summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorAdrian Likins <alikins@redhat.com>2007-09-25 18:14:18 -0400
committerAdrian Likins <alikins@redhat.com>2007-09-25 18:14:18 -0400
commit14fd0d98b171169e58acf62c86ef1f3a5d5128ee (patch)
tree58e05c896d45db420ce4d8f46a62c6879e02663c /scripts
parent6c38c3128afd8542d086ba998494e02872781b77 (diff)
downloadfunc-14fd0d98b171169e58acf62c86ef1f3a5d5128ee.tar.gz
func-14fd0d98b171169e58acf62c86ef1f3a5d5128ee.tar.xz
func-14fd0d98b171169e58acf62c86ef1f3a5d5128ee.zip
fix up the wrapper scripts so that --daemon works correctly, and so
the init scripts also work correctly
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/certmaster13
1 files changed, 4 insertions, 9 deletions
diff --git a/scripts/certmaster b/scripts/certmaster
index f4bcf53..d5f677d 100755
--- a/scripts/certmaster
+++ b/scripts/certmaster
@@ -2,15 +2,10 @@
from func import certmaster
-defaults = { 'listen_addr': 'localhost',
- 'listen_port': '51235',
- 'cadir': '/etc/pki/func/ca',
- 'certroot': '/var/lib/func/certmaster/certs',
- 'csrroot': '/var/lib/func/certmaster/csrs',
- 'autosign': 'false'
- }
+import sys
-cm = certmaster.CertMaster('/etc/func/certmaster.conf', defaults)
-certmaster.serve(cm)
+if __name__ == "__main__":
+ certmaster.main(sys.argv)
+