Added --nossl to HTTP daemons

Disable SSL on command line even if it's activated in cfg file.

Signed-off-by: Sven Velt <sven@velt.de>

diff --git a/nagixsc_conf2http.py b/nagixsc_conf2http.py
index d296bfff07bd2ca70da64fdd8e5ef3a1bbbccf2b..abeed4e8252fc59dd494702cee06ff6c6a632ded 100755 (executable)
--- a/nagixsc_conf2http.py
+++ b/nagixsc_conf2http.py
@@ -22,6 +22,7 @@ from nagixsc import *
 parser = optparse.OptionParser()
 
 parser.add_option('-c', '', dest='cfgfile', help='Config file')
+parser.add_option('', '--nossl', action='store_true', dest='nossl', help='Disable SSL (overwrites config file)')
 
 parser.set_defaults(cfgfile='conf2http.cfg')
 
@@ -124,6 +125,9 @@ class Conf2HTTPHandler(MyHTTPRequestHandler):
 
 
 def main():
+       if options.nossl:
+               config['ssl'] = False
+
        if config['ssl'] and not os.path.isfile(config['cert']):
                print 'SSL certificate "%s" not found!' % config['cert']
                sys.exit(127)

diff --git a/nagixsc_http2nagios.py b/nagixsc_http2nagios.py
index b0e6fd266e3522e07136c7158d1078cbad5410df..ad86b65eba536feb843e40198c1f06af8a55a11d 100755 (executable)
--- a/nagixsc_http2nagios.py
+++ b/nagixsc_http2nagios.py
@@ -22,6 +22,7 @@ from nagixsc import *
 parser = optparse.OptionParser()
 
 parser.add_option('-c', '', dest='cfgfile', help='Config file')
+parser.add_option('', '--nossl', action='store_true', dest='nossl', help='Disable SSL (overwrites config file)')
 
 parser.set_defaults(cfgfile='http2nagios.cfg')
 
@@ -121,6 +122,9 @@ class HTTP2NagiosHandler(MyHTTPRequestHandler):
 
 
 def main():
+       if options.nossl:
+               config['ssl'] = False
+
        if config['ssl'] and not os.path.isfile(config['cert']):
                print 'SSL certificate "%s" not found!' % config['cert']
                sys.exit(127)