diff src/twisted/plugins/libervia_server.py @ 813:6e27604ec95a

server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified.
author Goffi <goffi@goffi.org>
date Sun, 20 Dec 2015 20:01:42 +0100
parents b1826adbeeff
children e8c0c2b5e2d5
line wrap: on
line diff
--- a/src/twisted/plugins/libervia_server.py	Sun Dec 20 20:01:40 2015 +0100
+++ b/src/twisted/plugins/libervia_server.py	Sun Dec 20 20:01:42 2015 +0100
@@ -2,6 +2,8 @@
 # -*- coding: utf-8 -*-
 
 # Libervia: a Salut à Toi frontend
+# Copyright (C) 2013, 2014, 2015 Jérôme Poisson <goffi@goffi.org>
+# Copyright (C) 2013, 2014, 2015 Adrien Cossa <souliane@mailoo.org>
 # Copyright (C) 2013  Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
 
 # This program is free software: you can redistribute it and/or modify
@@ -66,7 +68,9 @@
                        ['port', 'p', 8080, _(u'The port number to listen HTTP on.').encode('utf-8'), int],
                        ['port_https', 's', 8443, _(u'The port number to listen HTTPS on.').encode('utf-8'), int],
                        ['port_https_ext', 'e', 0, _(u'The external port number used for HTTPS (0 means port_https value).').encode('utf-8'), int],
+                       ['tls_private_key', '', '', _(u'TLS certificate private key (PEM format)').encode('utf-8'), str],
                        ['tls_certificate', 'c', 'libervia.pem', _(u'TLS certificate public certificate or private key and public certificate combined (PEM format)').encode('utf-8'), str],
+                       ['tls_chain', '', '', _(u'TLS certificate intermediate chain (PEM format)').encode('utf-8'), str],
                        ['redirect_to_https', 'r', 1, _(u'Automatically redirect from HTTP to HTTPS.').encode('utf-8'), int],
                        ['security_warning', 'w', 1, _(u'Warn user that he is about to connect on HTTP.').encode('utf-8'), int],
                        ['passphrase', 'k', '', (_(u"Passphrase for the SàT profile named '%s'") % C.SERVICE_PROFILE).encode('utf-8'), str],