github-1: support for hashing functions other than sha1

[certmaster.git] / scripts / certmaster-request

diff --git a/scripts/certmaster-request b/scripts/certmaster-request
index b40a66c..0f11ba4 100755 (executable)
--- a/scripts/certmaster-request
+++ b/scripts/certmaster-request
@@ -16,8 +16,29 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 """
 
 import distutils.sysconfig
+import optparse
+import sys
+import xmlrpclib
 
 from certmaster import requester
 
 if __name__ == "__main__":
-    requester.request_cert()
+    parser = optparse.OptionParser()
+
+    parser.add_option('--hostname', action="store", dest="hostname",
+        metavar="NAME", 
+        help='hostname to use as the CN for the certificate')
+    
+    parser.add_option('--ca', action="store", dest="ca", default='',
+        metavar="CA", 
+        help='certificate authority used to sign the certificate')
+    
+    (opts, args) = parser.parse_args()
+
+    try:
+        requester.request_cert(hostname=opts.hostname, ca_name=opts.ca)
+    except xmlrpclib.Fault as f:
+        print >> sys.stderr, "error: %s" % str(f.faultString)
+    except Exception as e:
+        print >> sys.stderr, "error: %s" % str(e)
+        sys.exit(1)