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

2 files changed, 10 insertions, 2 deletions

diff --git a/src/conf_mode/host_name.py b/src/conf_mode/host_name.py
index bb1ec9597..47cf232e9 100755
--- a/src/conf_mode/host_name.py
+++ b/src/conf_mode/host_name.py
@@ -66,7 +66,7 @@ def get_config():
         hosts['nameserver'] = conf.return_values("system name-server")
 
     if conf.exists("system disable-dhcp-nameservers"):
-        hosts['no_dhcp_ns'] = conf.exists('system disable-dhcp-nameservers')
+        hosts['no_dhcp_ns'] = True
 
     # system static-host-mapping
     hosts['static_host_mapping'] = []
@@ -135,6 +135,10 @@ def apply(config):
     try:
         client = vyos.hostsd_client.Client()
 
+        # Check if disable-dhcp-nameservers is configured, and if yes - delete DNS servers added by DHCP
+        if config['no_dhcp_ns']:
+            client.delete_name_servers('dhcp-.+')
+
         client.set_host_name(config['hostname'], config['domain_name'], config['domain_search'])
 
         client.delete_name_servers(tag)
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[:]