From 0aec40f7a4ef3ee62691beef4772fcf3f9cef804 Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Fri, 25 Mar 2016 11:37:32 +0100 Subject: [PATCH] (ids/ips) use macro physical_interface --- src/opnsense/service/templates/OPNsense/IDS/rc.conf.d | 6 ++++-- .../service/templates/OPNsense/IDS/suricata.yaml | 10 ++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/opnsense/service/templates/OPNsense/IDS/rc.conf.d b/src/opnsense/service/templates/OPNsense/IDS/rc.conf.d index 565103cde..2598588f1 100644 --- a/src/opnsense/service/templates/OPNsense/IDS/rc.conf.d +++ b/src/opnsense/service/templates/OPNsense/IDS/rc.conf.d @@ -1,3 +1,5 @@ +{# Macro import #} +{% from 'OPNsense/Macros/interface.macro' import physical_interface %} {% if helpers.exists('OPNsense.IDS.general') and OPNsense.IDS.general.enabled|default("0") == "1" %} suricata_enable="YES" @@ -12,10 +14,10 @@ suricata_netmap=YES {% for intfName in OPNsense.IDS.general.interfaces.split(',') %} {% if loop.index == 1 %} {# enable first interface #} -suricata_interface="{{helpers.getNodeByTag('interfaces.'+intfName).if}}" +suricata_interface="{{ physical_interface(intfName) }}" {% else %} {# store additional interfaces to addFlags #} -{% do addFlags.append(helpers.getNodeByTag('interfaces.'+intfName).if) %} +{% do addFlags.append(physical_interface(intfName)) %} {% endif %} {% endfor %} {# append additional interfaces #} diff --git a/src/opnsense/service/templates/OPNsense/IDS/suricata.yaml b/src/opnsense/service/templates/OPNsense/IDS/suricata.yaml index 0360b3ff5..d0f96e1d5 100644 --- a/src/opnsense/service/templates/OPNsense/IDS/suricata.yaml +++ b/src/opnsense/service/templates/OPNsense/IDS/suricata.yaml @@ -1,3 +1,5 @@ +{# Macro import #} +{% from 'OPNsense/Macros/interface.macro' import physical_interface %} %YAML 1.1 --- @@ -317,11 +319,11 @@ netmap: {% if helpers.exists('OPNsense.IDS.general.interfaces') %} {% for intfName in OPNsense.IDS.general.interfaces.split(',') %} - - interface: {{helpers.getNodeByTag('interfaces.'+intfName).if}} - copy-iface: {{helpers.getNodeByTag('interfaces.'+intfName).if}}+ + - interface: {{physical_interface(intfName)}} + copy-iface: {{physical_interface(intfName)}}+ - - interface: {{helpers.getNodeByTag('interfaces.'+intfName).if}}+ - copy-iface: {{helpers.getNodeByTag('interfaces.'+intfName).if}} + - interface: {{physical_interface(intfName)}}+ + copy-iface: {{physical_interface(intfName)}} {% endfor %} {% endif %}