2 commits - func/minion func/overlord

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



 func/minion/server.py      |    6 +++---
 func/overlord/sslclient.py |    6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 3d39047ea3e38cb644e0ca608d0415652dafde56
Author: Seth Vidal <skvidal@xxxxxxxxxxxxxxxxx>
Date:   Fri Feb 25 15:53:01 2011 -0500

    fix acls --info output and change ordering of a few items in the output

diff --git a/func/minion/server.py b/func/minion/server.py
index 03201c6..cb84394 100644
--- a/func/minion/server.py
+++ b/func/minion/server.py
@@ -384,16 +384,16 @@ def main(argv):
         print 'server name: %s' % server.server_name
         print 'server listen addr: %s:%s' % server.server_address
         print 'key file:  %s' % server.key
+        print 'cert file: %s' % server.cert
+        print 'ca file: %s' % server.ca
         cert = certs.retrieve_cert_from_file(server.cert)
         print 'cert dn: %s' % cert.get_subject().CN
         print 'certificate hash: %s' % cert.subject_name_hash()
-        print 'cert file: %s' % server.cert
-        print 'ca file: %s' % server.ca
         print 'modules loaded:'
         for mn in sorted(server.modules.keys()):
             print '\t' + mn
         print 'acls:'
-        for (host, methods) in server.acls.acls:
+        for (host, methods) in server.acls.acls.items():
             print '\t' + host + ' : ' + str(methods)
         print 'facts:'
         for (n, meth) in server.fact_methods.items():


commit aa95dc473df1ac987dee1aefe4c8947e4eb00d50
Author: Ricky Zhou <rzhou@xxxxxxxxxx>
Date:   Fri Feb 25 15:52:36 2011 -0500

    patch from ricky zhou to fix func running under python 2.7

diff --git a/func/overlord/sslclient.py b/func/overlord/sslclient.py
index 16bd40f..3f49e1a 100644
--- a/func/overlord/sslclient.py
+++ b/func/overlord/sslclient.py
@@ -23,7 +23,11 @@ class SSL_Transport(xmlrpclib.Transport):
             # Yay for Python 2.2
             pass
         _host, _port = urllib.splitport(host)
-        return SSLCommon.HTTPS(_host, int(_port), ssl_context=self.ssl_ctx, timeout=self._timeout)
+        if hasattr(xmlrpclib.Transport, 'single_request'):
+            cnx_class = SSLCommon.HTTPSConnection
+        else:
+            cnx_class = SSLCommon.HTTPS
+        return cnx_class(_host, int(_port), ssl_context=self.ssl_ctx, timeout=self._timeout)
 
 
 class SSLXMLRPCServerProxy(xmlrpclib.ServerProxy):


_______________________________________________
Func-list mailing list
Func-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/func-list


[Index of Archives]     [Fedora Users]     [Linux Networking]     [Fedora Legacy List]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]

  Powered by Linux