X-Git-Url: https://pwan.org/git/?p=certmaster.git;a=blobdiff_plain;f=scripts%2Fcertmaster-request;h=de4d0474e73921f11a9df8cab2fdbe055269c95f;hp=3d807bdb511e121b5a025ec09c36a47a87e98fd9;hb=2096b7b7b4e1c4013ac16a18efd4dfa0d7d7ca33;hpb=8f2ff4d7c902d534d68ff1a16418b7be492033bf

diff --git a/scripts/certmaster-request b/scripts/certmaster-request
index 3d807bd..de4d047 100755
--- a/scripts/certmaster-request
+++ b/scripts/certmaster-request
@@ -1,10 +1,40 @@
 #!/usr/bin/python
 
+"""
+Application to request a cert from a certmaster.
+Takes no arguments, uses /etc/certmaster/minion.conf
+
+Copyright 2008, Red Hat, Inc
+Michael DeHaan <mdehaan@redhat.com>
+
+This software may be freely redistributed under the terms of the GNU
+general public license.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
 
-import sys
 import distutils.sysconfig
+import optparse
+import sys
 
-from func.minion import server
+from certmaster import requester
 
 if __name__ == "__main__":
-    server.main(sys.argv)
+    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 Exception as e:
+        print >> sys.stderr, "error: %s" % str(e)