From 8d27caa6f7f84c533eb3cccf8392f59039ae7eed Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Fri, 20 Oct 2023 15:28:38 +0200 Subject: [PATCH] MT#58452 Do not expect NGINX to listen on web_int for localhost There's currently a divergence between CE and PRO, where web_int is not setup by default as a role for the loopback interface on CE systems. We should thus for now not expect NGINX to be listening there, for the NGCP Panel admin and csc ports. In the future we should probably unify this behavior and make CE behave the same as a PRO, because this seems like a gratuitous divergence. Fixes: commit d0d8c1eb102023fd5968d304ffa2667b18b07050 Change-Id: Ib65b9dcf94a34b416d59aad93e19d88cf5a6469c --- templates/821_network-ports-ngcp.yaml.tt2 | 6 ------ templates/822_network-ports-ngcp-pro.yaml.tt2 | 10 ++++++++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/templates/821_network-ports-ngcp.yaml.tt2 b/templates/821_network-ports-ngcp.yaml.tt2 index 880471a..628b3e1 100644 --- a/templates/821_network-ports-ngcp.yaml.tt2 +++ b/templates/821_network-ports-ngcp.yaml.tt2 @@ -78,17 +78,11 @@ port: tcp:443: listening: true ip: ["[% web_ext_ips.0 %]"] - tcp6:443: - listening: true - ip: ["::1"] # Nginx HTTPS (NGCP Panel Admin) tcp:1443: listening: true ip: ["[% web_int_ips.0 %]"] - tcp6:1443: - listening: true - ip: ["::1"] [% END -%] [% IF is_mgmt && pbx.enable == 'yes' -%] diff --git a/templates/822_network-ports-ngcp-pro.yaml.tt2 b/templates/822_network-ports-ngcp-pro.yaml.tt2 index e12ce3c..d3d7364 100644 --- a/templates/822_network-ports-ngcp-pro.yaml.tt2 +++ b/templates/822_network-ports-ngcp-pro.yaml.tt2 @@ -16,6 +16,16 @@ port: listening: true ip: ["::1"] + # Nginx HTTPS (NGCP Panel) + tcp6:443: + listening: true + ip: ["::1"] + + # Nginx HTTPS (NGCP Panel Admin) + tcp6:1443: + listening: true + ip: ["::1"] + # Corosync udp:5405: listening: [% ha.gcs == 'corosync' ? 'true' : 'false' %]