summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorAdrian Likins <alikins@redhat.com>2007-09-25 11:50:28 -0400
committerAdrian Likins <alikins@redhat.com>2007-09-25 11:50:28 -0400
commitfb7df2a5b7834ead29effb5c60bdc33558546631 (patch)
tree6c70ccfb037ab621cc69085ba8d5b540753d81dd /scripts
parent9c72cbd826528bb64267ba2184ae16099343c7ab (diff)
parent47100aa2f165b47175af1e1aef736c5769a83169 (diff)
downloadthird_party-func-fb7df2a5b7834ead29effb5c60bdc33558546631.tar.gz
third_party-func-fb7df2a5b7834ead29effb5c60bdc33558546631.tar.xz
third_party-func-fb7df2a5b7834ead29effb5c60bdc33558546631.zip
Merge branch 'master' of ssh://git.fedoraproject.org/git/hosted/func
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/certmaster12
-rwxr-xr-xscripts/funcd2
2 files changed, 13 insertions, 1 deletions
diff --git a/scripts/certmaster b/scripts/certmaster
new file mode 100755
index 0000000..3b212b4
--- /dev/null
+++ b/scripts/certmaster
@@ -0,0 +1,12 @@
+#!/usr/bin/python
+
+import sys
+import distutils.sysconfig
+
+sys.path.append("%s/func" % distutils.sysconfig.get_python_lib())
+
+import certmaster
+
+cm = certmaster.CertMaster('/etc/func/certmaster.conf')
+server = certmaster.serve(cm)
+
diff --git a/scripts/funcd b/scripts/funcd
index 165dd68..2301acf 100755
--- a/scripts/funcd
+++ b/scripts/funcd
@@ -6,7 +6,7 @@ import distutils.sysconfig
sys.path.append("%s/func" % distutils.sysconfig.get_python_lib())
-from server import server
+from minion import server
if __name__ == "__main__":
server.main(sys.argv)