X-Git-Url: https://pwan.org/git/?p=certmaster.git;a=blobdiff_plain;f=certmaster%2Fcertmaster.py;h=9548b8b77d0071d6e3dccbf2a5e382fc026d74c6;hp=58cb50b5f66a2dcc146550754490d5daa425595d;hb=31cc0f346dc740d416c6d174ad6bd40e0765ee7a;hpb=30ba30eb28592eb3a95a1d661ef76842977a2c18

diff --git a/certmaster/certmaster.py b/certmaster/certmaster.py
index 58cb50b..9548b8b 100644
--- a/certmaster/certmaster.py
+++ b/certmaster/certmaster.py
@@ -352,12 +352,15 @@ def main(argv):
     sys.excepthook = excepthook  
     cm = CertMaster('/etc/certmaster/certmaster.conf')
 
+    if "--version" in sys.argv or "-v" in sys.argv:
+        print >> sys.stderr, file("/etc/certmaster/version").read().strip()
+        sys.exit(0)
+
     if "daemon" in argv or "--daemon" in argv:
         utils.daemonize("/var/run/certmaster.pid")
     else:
         print "serving...\n"
 
-
     # just let exceptions bubble up for now
     serve(cm)