From b06454344491f51f8c89bcc15834336cde27051a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Vanet?= Date: Sun, 14 Jul 2019 17:43:27 +0200 Subject: [PATCH] Fix frr ospfd template on redistribute config section (#1401) --- net/frr/Makefile | 2 +- .../opnsense/service/templates/OPNsense/Quagga/ospfd.conf | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/frr/Makefile b/net/frr/Makefile index da55d1ba6..2f72a9c29 100644 --- a/net/frr/Makefile +++ b/net/frr/Makefile @@ -1,6 +1,6 @@ PLUGIN_NAME= frr PLUGIN_VERSION= 1.11 -PLUGIN_REVISION= 1 +PLUGIN_REVISION= 2 PLUGIN_COMMENT= The FRRouting Protocol Suite PLUGIN_DEPENDS= frr6 ruby PLUGIN_MAINTAINER= franz.fabian.94@gmail.com diff --git a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/ospfd.conf b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/ospfd.conf index da64ff990..1badab6a1 100644 --- a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/ospfd.conf +++ b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/ospfd.conf @@ -45,9 +45,9 @@ router ospf {% endif %} {% if helpers.exists('OPNsense.quagga.ospf.redistribute') and OPNsense.quagga.ospf.redistribute != '' %} {% for line in OPNsense.quagga.ospf.redistribute.split(',') %} -{% set rmap = helpers.getUUID(OPNsense.quagga.ospf.redistributemap) %} - redistribute {{ line }} {% if helpers.exists('OPNsense.quagga.ospf.redistributemap') and OPNsense.quagga.ospf.redistributemap != '' %}route-map {{ rmap.name }} -{% endif %} + {% if helpers.exists('OPNsense.quagga.ospf.redistributemap') and OPNsense.quagga.ospf.redistributemap != '' %}{% set line = line + " route-map " + helpers.getUUID(OPNsense.quagga.ospf.redistributemap).name %}{% + endif %} +redistribute {{ line }} {% endfor %}{% endif %} {% if helpers.exists('OPNsense.quagga.ospf.passiveinterfaces') and OPNsense.quagga.ospf.passiveinterfaces != '' %} {% for line in OPNsense.quagga.ospf.passiveinterfaces.split(',') %}