summaryrefslogtreecommitdiff
path: root/src/conf_mode/https.py
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2019-11-17 21:13:19 +0100
committerChristian Poessinger <christian@poessinger.com>2019-11-17 21:13:19 +0100
commitd3b689ecb951c49dddf0402f36f51a2e0d8216b3 (patch)
tree1048aec8ff2347696643d92a4bf48170936b4201 /src/conf_mode/https.py
parent80375d2be96c53f2fa4a827f93105dc32931401f (diff)
parent4e4f1dbd745952a24d70c3e2d7dc495d675dff34 (diff)
downloadvyos-1x-d3b689ecb951c49dddf0402f36f51a2e0d8216b3.tar.gz
vyos-1x-d3b689ecb951c49dddf0402f36f51a2e0d8216b3.zip
Merge branch 'current' of github.com:vyos/vyos-1x into equuleus
* 'current' of github.com:vyos/vyos-1x: dns: T1786: add proper processing of 'system disable-dhcp-nameservers' openvpn: fix typo in op-mode command on display rx bytes T1801: escape isolated backslashes before passing to ConfigTree() wireless: T1627: fix interface names for list_interfaces.py [service https] T1443: add setting of HTTPS listen port
Diffstat (limited to 'src/conf_mode/https.py')
-rwxr-xr-xsrc/conf_mode/https.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/conf_mode/https.py b/src/conf_mode/https.py
index d7fcb74de..fbd351e45 100755
--- a/src/conf_mode/https.py
+++ b/src/conf_mode/https.py
@@ -49,7 +49,7 @@ server {
listen 443 ssl;
listen [::]:443 ssl;
{% else %}
- listen {{ server.address }}:443 ssl;
+ listen {{ server.address }}:{{ server.port }} ssl;
{% endif %}
{% for name in server.name %}
@@ -107,7 +107,11 @@ def get_config():
if conf.exists('listen-address'):
for addr in conf.list_nodes('listen-address'):
server_block = {'address' : addr}
+ server_block['port'] = '443'
server_block['name'] = ['_']
+ if conf.exists('listen-address {0} listen-port'.format(addr)):
+ port = conf.return_value('listen-address {0} listen-port'.format(addr))
+ server_block['port'] = port
if conf.exists('listen-address {0} server-name'.format(addr)):
names = conf.return_values('listen-address {0} server-name'.format(addr))
server_block['name'] = names[:]