From fe6c6410216289b6f3b54b341f4723e1ac07dbba Mon Sep 17 00:00:00 2001 From: mdipierro Date: Mon, 20 Aug 2012 16:03:19 -0500 Subject: [PATCH] better options_std.py, thanks Niphlod --- VERSION | 2 +- options_std.py | 14 +++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/VERSION b/VERSION index b6f16910..10eca311 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.00.0 (2012-08-20 16:02:06) dev +Version 2.00.0 (2012-08-20 16:03:17) dev diff --git a/options_std.py b/options_std.py index 7cac9fc2..feb0a48f 100644 --- a/options_std.py +++ b/options_std.py @@ -1,9 +1,9 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -# when web2py is run as a windows service (web2py.exe -W) +# when web2py is run as a windows service (web2py.py -W) # it does not load the command line options but it -# expects to find conifguration settings in a file called +# expects to find configuration settings in a file called # # web2py/options.py # @@ -14,13 +14,13 @@ import os ip = '0.0.0.0' port = 80 -interfaces=[('0.0.0.0',80),('0.0.0.0',443,'ssl_private_key.pem','ssl_certificate.pem')] +interfaces=[('0.0.0.0',80)] #,('0.0.0.0',443,'ssl_private_key.pem','ssl_certificate.pem')] password = '' # ## means use the previous password pid_filename = 'httpserver.pid' log_filename = 'httpserver.log' profiler_filename = None -#ssl_certificate = 'ssl_certificate.pem' # ## path to certificate file -#ssl_private_key = 'ssl_private_key.pem' # ## path to private key file +ssl_certificate = None #'ssl_certificate.pem' # ## path to certificate file +ssl_private_key = None #'ssl_private_key.pem' # ## path to private key file #numthreads = 50 # ## deprecated; remove minthreads = None maxthreads = None @@ -31,7 +31,3 @@ shutdown_timeout = 5 folder = os.getcwd() extcron = None nocron = None - - - -