Merge branch 'master' of ssh://git.fedoraproject.org/git/hosted/func

2 files changed, 5 insertions, 12 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)
+    
 
 
diff --git a/scripts/funcd b/scripts/funcd
index 2301acf..3d807bd 100755
--- a/scripts/funcd
+++ b/scripts/funcd
@@ -4,9 +4,7 @@
 import sys
 import distutils.sysconfig
 
-sys.path.append("%s/func" % distutils.sysconfig.get_python_lib())
-
-from minion import server
+from func.minion import server
 
 if __name__ == "__main__":
     server.main(sys.argv)