summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@mdehaan.rdu.redhat.com>2007-09-26 15:20:26 -0400
committerMichael DeHaan <mdehaan@mdehaan.rdu.redhat.com>2007-09-26 15:20:26 -0400
commit5add4f4389d7c73fcf08edb5a2944b513d432446 (patch)
treecf37b537decaafad671bbb71638db772eb8b92e5
parenteb0943d341eed6128887aff891ba122e2cdc2b51 (diff)
downloadthird_party-func-5add4f4389d7c73fcf08edb5a2944b513d432446.tar.gz
third_party-func-5add4f4389d7c73fcf08edb5a2944b513d432446.tar.xz
third_party-func-5add4f4389d7c73fcf08edb5a2944b513d432446.zip
Merge with alikins.
-rwxr-xr-xoverlord/client.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/overlord/client.py b/overlord/client.py
index 5c271aa..e16b198 100755
--- a/overlord/client.py
+++ b/overlord/client.py
@@ -90,7 +90,7 @@ class Client():
"""
if self.noglobs:
- return [ "http://%s:%s" % (spec, self.port) ]
+ return [ "https://%s:%s" % (spec, self.port) ]
all_hosts = []
all_certs = []
@@ -108,7 +108,7 @@ class Client():
all_urls = []
for x in all_hosts:
- all_urls.append("http://%s:%s" % (x, self.port))
+ all_urls.append("https://%s:%s" % (x, self.port))
if self.verbose and len(all_urls) == 0:
sys.stderr.write("no hosts matched\n")
@@ -148,10 +148,8 @@ class Client():
for server in self.servers:
- # FIXME: add SSL
-
conn = sslclient.FuncServer(server)
-# conn = xmlrpclib.ServerProxy(server)
+ # conn = xmlrpclib.ServerProxy(server)
if self.verbose:
sys.stderr.write("on %s running %s %s (%s)\n" % (server, module, method, ",".join(args)))