diff options
| author | Patrick Maia <pixelated-team+pmaia@thoughtworks.com> | 2014-12-03 14:56:10 -0300 |
|---|---|---|
| committer | Patrick Maia <pmaia@thoughtworks.com> | 2014-12-03 15:11:15 -0300 |
| commit | 17fab38c4cf5711db9d7d5f2c0c850846c6d5728 (patch) | |
| tree | 751f31a71caea5918e9b38cb35ae23023d3514fc /service | |
| parent | 7594b311441ca0c0eee39b4e953c52645213ffc3 (diff) | |
Card #149 - does not open two ports when running with SSL
Diffstat (limited to 'service')
| -rw-r--r-- | service/pixelated/config/app_factory.py | 3 | ||||
| -rw-r--r-- | service/pixelated/config/args.py | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/service/pixelated/config/app_factory.py b/service/pixelated/config/app_factory.py index 2021556d..b8996b54 100644 --- a/service/pixelated/config/app_factory.py +++ b/service/pixelated/config/app_factory.py @@ -176,8 +176,7 @@ def listen_with_ssl(app, args): acceptable = ssl.AcceptableCiphers.fromOpenSSLCipherString('ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:!RC4:HIGH:!MD5:!aNULL:!EDH') options = ssl.CertificateOptions(privateKey=pkey, certificate=cert, method=SSL.TLSv1_2_METHOD, acceptableCiphers=acceptable) - reactor.listenSSL(args.ssl_port, Site(app.resource()), options, interface=args.host) - reactor.listenTCP(args.port, Site(RedirectToSSL(args.ssl_port))) + reactor.listenSSL(args.port, Site(app.resource()), options, interface=args.host) return reactor diff --git a/service/pixelated/config/args.py b/service/pixelated/config/args.py index de47996a..d08df929 100644 --- a/service/pixelated/config/args.py +++ b/service/pixelated/config/args.py @@ -24,7 +24,6 @@ def parse(): parser.add_argument('--dispatcher-stdin', help='run in organization mode, the credentials will be read from stdin', default=False, action='store_true', dest='dispatcher_stdin') parser.add_argument('--host', default='127.0.0.1', help='the host to run the user agent on') parser.add_argument('--port', type=int, default=3333, help='the port to run the user agent on') - parser.add_argument('--ssl-port', type=int, default=3433, help='the port to run the user agent with SSL support') parser.add_argument('-c', '--config', metavar='<configfile>', default=None, help='use specified file for credentials (for test purposes only)') parser.add_argument('-sk', '--sslkey', metavar='<server.key>', default=None, help='use specified file for SSL key') parser.add_argument('-sc', '--sslcert', metavar='<server.pem>', default=None, help='use specified file for SSL certificate') |