diff options
| -rw-r--r-- | certs/master-keys.py | 2 | ||||
| -rw-r--r-- | certs/slave-keys.py | 18 | ||||
| -rwxr-xr-x | func/certmaster.py | 20 | ||||
| -rwxr-xr-x | func/codes.py | 4 | ||||
| -rwxr-xr-x | func/logger.py | 2 | ||||
| -rwxr-xr-x | func/utils.py | 14 |
6 files changed, 30 insertions, 30 deletions
diff --git a/certs/master-keys.py b/certs/master-keys.py index f576b77..2c3f6e5 100644 --- a/certs/master-keys.py +++ b/certs/master-keys.py @@ -40,5 +40,5 @@ def main(): if __name__ == "__main__": - sys.exit(main()) + sys.exit(main()) diff --git a/certs/slave-keys.py b/certs/slave-keys.py index 37087f6..8ddae81 100644 --- a/certs/slave-keys.py +++ b/certs/slave-keys.py @@ -66,22 +66,22 @@ def main(cert_dir, master_uri): if result: - cert_fo = open(cert_file, 'w') - cert_fo.write(cert_string) - cert_fo.close() - - ca_cert_fo = open(ca_cert_file, 'w') - ca_cert_fo.write(ca_cert_string) - ca_cert_fo.close() + cert_fo = open(cert_file, 'w') + cert_fo.write(cert_string) + cert_fo.close() + + ca_cert_fo = open(ca_cert_file, 'w') + ca_cert_fo.write(ca_cert_string) + ca_cert_fo.close() return 0 if __name__ == "__main__": if len(sys.argv[1:]) > 0: - cert_dir = sys.argv[1] + cert_dir = sys.argv[1] else: - cert_dir = '/etc/pki/func' + cert_dir = '/etc/pki/func' if len(sys.argv[1:]) > 1: master_uri = sys.argv[2] diff --git a/func/certmaster.py b/func/certmaster.py index e836889..e881b3e 100755 --- a/func/certmaster.py +++ b/func/certmaster.py @@ -173,7 +173,7 @@ class CertMaster(object): try: csrreq = crypto.load_certificate_request(crypto.FILETYPE_PEM, csr_buf) except crypto.Error, e: - print 'Bad CSR: %s' % csr + print 'Bad CSR: %s' % csr else: # assume we got a bare csr req csrreq = csr @@ -193,20 +193,20 @@ class CertMaster(object): class CertmasterXMLRPCServer(SimpleXMLRPCServer.SimpleXMLRPCServer): def __init__(self, args): - self.allow_reuse_address = True - SimpleXMLRPCServer.SimpleXMLRPCServer.__init__(self, args) + self.allow_reuse_address = True + SimpleXMLRPCServer.SimpleXMLRPCServer.__init__(self, args) def serve(xmlrpcinstance): - """ - Code for starting the XMLRPC service. - """ + """ + Code for starting the XMLRPC service. + """ - server = CertmasterXMLRPCServer((xmlrpcinstance.cfg.listen_addr, xmlrpcinstance.cfg.listen_port)) - server.logRequests = 0 # don't print stuff to console - server.register_instance(xmlrpcinstance) - server.serve_forever() + server = CertmasterXMLRPCServer((xmlrpcinstance.cfg.listen_addr, xmlrpcinstance.cfg.listen_port)) + server.logRequests = 0 # don't print stuff to console + server.register_instance(xmlrpcinstance) + server.serve_forever() def main(argv): diff --git a/func/codes.py b/func/codes.py index c549709..058ca44 100755 --- a/func/codes.py +++ b/func/codes.py @@ -17,9 +17,9 @@ import exceptions class FuncException(exceptions.Exception): - pass + pass class InvalidMethodException(FuncException): - pass + pass # FIXME: more sub-exceptions maybe diff --git a/func/logger.py b/func/logger.py index cdfa899..94df311 100755 --- a/func/logger.py +++ b/func/logger.py @@ -59,7 +59,7 @@ class AuditLogger(Singleton): self.loglevel = logging.INFO self._setup_logging() if self._no_handlers: - self._setup_handlers(logfilepath=logfilepath) + self._setup_handlers(logfilepath=logfilepath) def log_call(self, ip, CN, cert_hash, method, params): # square away a good parseable format at some point -akl diff --git a/func/utils.py b/func/utils.py index 724c847..8d9d383 100755 --- a/func/utils.py +++ b/func/utils.py @@ -21,9 +21,9 @@ import traceback # but we really need to fix out server side logging and error # reporting so we don't need it def trace_me(): - x = traceback.extract_stack() - bar = string.join(traceback.format_list(x)) - return bar + x = traceback.extract_stack() + bar = string.join(traceback.format_list(x)) + return bar def daemonize(pidfile=None): @@ -35,13 +35,13 @@ def daemonize(pidfile=None): print pidfile pid = os.fork() if pid > 0: - sys.exit(0) + sys.exit(0) os.setsid() os.umask(0) pid = os.fork() if pid > 0: - if pidfile is not None: - open(pidfile, "w").write(str(pid)) - sys.exit(0) + if pidfile is not None: + open(pidfile, "w").write(str(pid)) + sys.exit(0) |