Updated checking for key and cert files.

drmats · Jan 25, 2014 · 8fe143f · 8fe143f
1 parent c04888b
commit 8fe143f
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/fup.py b/fup.py
@@ -737,7 +737,6 @@ def run_server (self, host, port, config):
                 )
                 os.kill(config["ppid"], signal.SIGINT)
                 return
-
             if not os.path.isfile(config["cert"]):
                 print(
                     "Provide a valid path to SSL certificate " + \
@@ -746,7 +745,6 @@ def run_server (self, host, port, config):
                 )
                 os.kill(config["ppid"], signal.SIGINT)
                 return
-
             try:
                 import ssl
                 httpd.socket = \
@@ -773,6 +771,10 @@ def run_server (self, host, port, config):
                 )
                 os.kill(config["ppid"], signal.SIGINT)
                 return
+        elif os.path.isfile(config["key"]) or os.path.isfile(config["cert"]):
+            print("Use --ssl switch.", file=sys.stderr)
+            os.kill(config["ppid"], signal.SIGINT)
+            return
 
         print(
             "listening on %s:%u%s" \