summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorViacheslav Hletenko <v.gletenko@vyos.io>2023-11-22 08:09:20 +0200
committerGitHub <noreply@github.com>2023-11-22 08:09:20 +0200
commit756bd6d45ab76cca7155fb76a0d3c8e4dbe6d517 (patch)
tree9072da20295d86482d94a864f961e57a869cfd56 /src
parentd908073cac14539ba54665715ab84a5bf40662ad (diff)
parent92a75196e5a0d9568905f1c990a080cc4e1e0ea9 (diff)
downloadvyos-1x-756bd6d45ab76cca7155fb76a0d3c8e4dbe6d517.tar.gz
vyos-1x-756bd6d45ab76cca7155fb76a0d3c8e4dbe6d517.zip
Merge pull request #2523 from vyos/mergify/bp/sagitta/pr-2519
http: T5762: rename "virtual-host listen-port" -> "virtual-host port" (backport #2519)
Diffstat (limited to 'src')
-rwxr-xr-xsrc/conf_mode/https.py4
-rwxr-xr-xsrc/migration-scripts/https/4-to-56
2 files changed, 8 insertions, 2 deletions
diff --git a/src/conf_mode/https.py b/src/conf_mode/https.py
index 028a5007a..26c4343a0 100755
--- a/src/conf_mode/https.py
+++ b/src/conf_mode/https.py
@@ -122,7 +122,7 @@ def verify(https):
server_block = deepcopy(default_server_block)
data = vhost_dict.get(vhost, {})
server_block['address'] = data.get('listen-address', '*')
- server_block['port'] = data.get('listen-port', '443')
+ server_block['port'] = data.get('port', '443')
server_block_list.append(server_block)
for entry in server_block_list:
@@ -156,7 +156,7 @@ def generate(https):
server_block['id'] = vhost
data = vhost_dict.get(vhost, {})
server_block['address'] = data.get('listen-address', '*')
- server_block['port'] = data.get('listen-port', '443')
+ server_block['port'] = data.get('port', '443')
name = data.get('server-name', ['_'])
server_block['name'] = name
allow_client = data.get('allow-client', {})
diff --git a/src/migration-scripts/https/4-to-5 b/src/migration-scripts/https/4-to-5
index a503e0cb7..0dfb6ac19 100755
--- a/src/migration-scripts/https/4-to-5
+++ b/src/migration-scripts/https/4-to-5
@@ -48,6 +48,12 @@ if config.exists(base + ['api', 'socket']):
if config.exists(base + ['api', 'port']):
config.delete(base + ['api', 'port'])
+# rename listen-port -> port ver virtual-host
+if config.exists(base + ['virtual-host']):
+ for vhost in config.list_nodes(base + ['virtual-host']):
+ if config.exists(base + ['virtual-host', vhost, 'listen-port']):
+ config.rename(base + ['virtual-host', vhost, 'listen-port'], 'port')
+
try:
with open(file_name, 'w') as f:
f.write(config.to_string())