Fix frr ospfd template on redistribute config section (opnsense#1401)

Nimloth · Jul 14, 2019 · b064543 · b064543
1 parent 1116095
commit b064543
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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=	[email protected]

diff --git 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(',') %}