From 09855f41c30fba6bd314a1ba9e9b58f866efbe6a Mon Sep 17 00:00:00 2001
From: Monviech <79600909+Monviech@users.noreply.github.com>
Date: Mon, 30 Jun 2025 10:06:27 +0200
Subject: [PATCH] net/frr: Activate peergroup in address family (#4777)

---
 .../opnsense/service/templates/OPNsense/Quagga/bgpd.conf    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/bgpd.conf b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/bgpd.conf
index 51c0ba3d9..4e29d3707 100644
--- a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/bgpd.conf
+++ b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/bgpd.conf
@@ -59,7 +59,6 @@ router bgp {{ OPNsense.quagga.bgp.asnumber }}
 {%       if peergroup.updatesource %}
  neighbor {{ peergroup.name }} update-source {{ physical_interface(peergroup.updatesource) }}
 {%       endif %}
- neighbor {{ peergroup.name }} activate
 {%       if  peergroup.nexthopself|default('0') == '1' %}
  neighbor {{ peergroup.name }} next-hop-self
 {%       endif %}
@@ -163,6 +162,11 @@ router bgp {{ OPNsense.quagga.bgp.asnumber }}
 {%   for network in networks[addressFamily] %}
   network {{ network }}
 {%   endfor %}
+{%   for peergroup in helpers.toList('OPNsense.quagga.bgp.peergroups.peergroup') %}
+{%     if peergroup.enabled == '1' %}
+  neighbor {{ peergroup.name }} activate
+{%     endif %}
+{%   endfor %}
 {%   for neighbor in neighbors[addressFamily] %}
   neighbor {{ neighbor.address }} activate
 {%     if 'nexthopself' in neighbor and neighbor.nexthopself == '1' %}