diff --git a/net/ntopng/Makefile b/net/ntopng/Makefile index ac7da5a1a..5da05c18f 100644 --- a/net/ntopng/Makefile +++ b/net/ntopng/Makefile @@ -1,6 +1,5 @@ PLUGIN_NAME= ntopng -PLUGIN_VERSION= 1.2 -PLUGIN_REVISION= 2 +PLUGIN_VERSION= 1.3 PLUGIN_COMMENT= Traffic Analysis and Flow Collection PLUGIN_DEPENDS= ntopng PLUGIN_MAINTAINER= m.muenz@gmail.com diff --git a/net/ntopng/pkg-descr b/net/ntopng/pkg-descr index 5ea68cabd..968b0f660 100644 --- a/net/ntopng/pkg-descr +++ b/net/ntopng/pkg-descr @@ -8,6 +8,10 @@ and on Windows as well. Plugin Changelog ================ +1.3 + +* Change interface selection to multiselect + 1.2 * Changed data directory to avoid warning diff --git a/net/ntopng/src/opnsense/mvc/app/controllers/OPNsense/Ntopng/forms/general.xml b/net/ntopng/src/opnsense/mvc/app/controllers/OPNsense/Ntopng/forms/general.xml index e417cd9f6..b334d3ad0 100644 --- a/net/ntopng/src/opnsense/mvc/app/controllers/OPNsense/Ntopng/forms/general.xml +++ b/net/ntopng/src/opnsense/mvc/app/controllers/OPNsense/Ntopng/forms/general.xml @@ -8,7 +8,7 @@ general.interface - dropdown + select_multiple true Select the interface to listen to. Set to none if you want to choose the interface via ntopng UI. diff --git a/net/ntopng/src/opnsense/mvc/app/models/OPNsense/Ntopng/General.xml b/net/ntopng/src/opnsense/mvc/app/models/OPNsense/Ntopng/General.xml index 822fc38dc..dea24b7d2 100644 --- a/net/ntopng/src/opnsense/mvc/app/models/OPNsense/Ntopng/General.xml +++ b/net/ntopng/src/opnsense/mvc/app/models/OPNsense/Ntopng/General.xml @@ -1,7 +1,7 @@ //OPNsense/ntopng/general ntopng configuration - 0.0.1 + 0.0.2 0 @@ -9,7 +9,8 @@ N - N + Y + Y Y diff --git a/net/ntopng/src/opnsense/service/templates/OPNsense/Ntopng/ntopng.conf b/net/ntopng/src/opnsense/service/templates/OPNsense/Ntopng/ntopng.conf index 47749eeeb..48def3ea3 100644 --- a/net/ntopng/src/opnsense/service/templates/OPNsense/Ntopng/ntopng.conf +++ b/net/ntopng/src/opnsense/service/templates/OPNsense/Ntopng/ntopng.conf @@ -1,7 +1,9 @@ {% if helpers.exists('OPNsense.ntopng.general.enabled') and OPNsense.ntopng.general.enabled == '1' %} {% from 'OPNsense/Macros/interface.macro' import physical_interface %} {% if helpers.exists('OPNsense.ntopng.general.interface') and OPNsense.ntopng.general.interface != '' %} --i={{ physical_interface(OPNsense.ntopng.general.interface) }} +{% for iface in OPNsense.ntopng.general.interface.split(',') %} +-i={{ physical_interface(iface) }} +{% endfor %} {% endif %} {% if helpers.exists('OPNsense.ntopng.general.httpport') and OPNsense.ntopng.general.httpport != '' %} -w={{ OPNsense.ntopng.general.httpport }}