From 39985f0c1d4a1c885b802fe50ced07b7bd4cca62 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Wed, 21 Dec 2022 13:31:25 +0100
Subject: [PATCH] core changes - refactor intf_item.type usage as referred to
 in https://github.com/opnsense/core/issues/6181

---
 .../src/opnsense/service/templates/OPNsense/Redis/redis.conf    | 2 +-
 security/tor/src/opnsense/service/templates/OPNsense/Tor/torrc  | 2 +-
 .../src/opnsense/service/templates/OPNsense/Nginx/webgui.conf   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/databases/redis/src/opnsense/service/templates/OPNsense/Redis/redis.conf b/databases/redis/src/opnsense/service/templates/OPNsense/Redis/redis.conf
index 6deeeda1a..a42284da4 100644
--- a/databases/redis/src/opnsense/service/templates/OPNsense/Redis/redis.conf
+++ b/databases/redis/src/opnsense/service/templates/OPNsense/Redis/redis.conf
@@ -54,7 +54,7 @@
 {%     endif %}
 {%     if helpers.exists('virtualip') %}
 {%       for intf_item in helpers.toList('virtualip.vip') %}
-{%         if intf_item.interface == listen_interface and intf_item.type == 'single' %}
+{%         if intf_item.interface == listen_interface and intf_item.mode in ['carp', 'ipalias'] %}
 {%           if intf_item.subnet.find(':') > -1 %}
 {% do listen_ip.append(interface_ip) %}
 {%           else %}
diff --git a/security/tor/src/opnsense/service/templates/OPNsense/Tor/torrc b/security/tor/src/opnsense/service/templates/OPNsense/Tor/torrc
index 2f8ab8a10..977761eb8 100644
--- a/security/tor/src/opnsense/service/templates/OPNsense/Tor/torrc
+++ b/security/tor/src/opnsense/service/templates/OPNsense/Tor/torrc
@@ -27,7 +27,7 @@ SOCKSPort [{{ interface_ip }}]:{{ OPNsense.tor.general.socks_listen_port|default
 {%     endif %}
 {%     if helpers.exists('virtualip') %}
 {%       for intf_item in helpers.toList('virtualip.vip') %}
-{%         if intf_item.interface == listen_interface and intf_item.type == 'single' %}
+{%         if intf_item.interface == listen_interface and intf_item.mode in ['carp', 'ipalias'] %}
 {%           if intf_item.subnet.find(':') > -1 %}
 # {{ listen_interface }}: IPv6 VIP
 SOCKSPort [{{ intf_item.subnet }}]:{{ OPNsense.tor.general.socks_listen_port|default('9050') }}
diff --git a/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/webgui.conf b/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/webgui.conf
index 3288fe406..8a14feeb1 100644
--- a/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/webgui.conf
+++ b/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/webgui.conf
@@ -147,7 +147,7 @@ server {
 {% endfor %}
 {% if helpers.exists('virtualip') %}
 {%   for intf_item in helpers.toList('virtualip.vip') %}
-{%     if intf_item.type == 'single' %}
+{%     if intf_item.mode in ['carp', 'ipalias'] %}
 {%       set cidr = intf_item.subnet + '/' + intf_item.subnet_bits %}
 {%       if cidr not in whitelisted_networks %}
   allow {{ cidr }};