diff --git a/security/maltrail/Makefile b/security/maltrail/Makefile index ba4625090..051a29b99 100644 --- a/security/maltrail/Makefile +++ b/security/maltrail/Makefile @@ -1,5 +1,6 @@ PLUGIN_NAME= maltrail PLUGIN_VERSION= 1.9 +PLUGIN_REVISION= 1 PLUGIN_COMMENT= Malicious traffic detection system PLUGIN_DEPENDS= maltrail PLUGIN_MAINTAINER= m.muenz@gmail.com diff --git a/security/maltrail/src/opnsense/service/conf/actions.d/actions_maltrailsensor.conf b/security/maltrail/src/opnsense/service/conf/actions.d/actions_maltrailsensor.conf index 51b2c6653..530780446 100644 --- a/security/maltrail/src/opnsense/service/conf/actions.d/actions_maltrailsensor.conf +++ b/security/maltrail/src/opnsense/service/conf/actions.d/actions_maltrailsensor.conf @@ -1,5 +1,5 @@ [start] -command:/usr/local/opnsense/scripts/OPNsense/Maltrail/setup.sh;/usr/local/etc/rc.d/opnsense-maltrailsensor start +command:/usr/local/etc/rc.d/opnsense-maltrailsensor start parameters: type:script message:starting Maltrail sensor @@ -11,14 +11,14 @@ type:script message:stopping Maltrail sensor [restart] -command:/usr/local/opnsense/scripts/OPNsense/Maltrail/setup.sh;/usr/local/etc/rc.d/opnsense-maltrailsensor restart +command:/usr/local/etc/rc.d/opnsense-maltrailsensor restart parameters: type:script message:restarting Maltrail sensor description:Restart Maltrail sensor [status] -command:/usr/local/etc/rc.d/opnsense-maltrailsensor status;exit 0 +command:/usr/local/etc/rc.d/opnsense-maltrailsensor status; exit 0 parameters: type:script_output message:request Maltrail sensor status diff --git a/security/maltrail/src/opnsense/service/conf/actions.d/actions_maltrailserver.conf b/security/maltrail/src/opnsense/service/conf/actions.d/actions_maltrailserver.conf index ad8313f6f..1cd65664b 100644 --- a/security/maltrail/src/opnsense/service/conf/actions.d/actions_maltrailserver.conf +++ b/security/maltrail/src/opnsense/service/conf/actions.d/actions_maltrailserver.conf @@ -1,5 +1,5 @@ [start] -command:/usr/local/opnsense/scripts/OPNsense/Maltrail/setup.sh;/usr/local/etc/rc.d/opnsense-maltrailserver start +command:/usr/local/etc/rc.d/opnsense-maltrailserver start parameters: type:script message:starting Maltrail Server @@ -11,13 +11,13 @@ type:script message:stopping Maltrail Server [restart] -command:/usr/local/opnsense/scripts/OPNsense/Maltrail/setup.sh;/usr/local/etc/rc.d/opnsense-maltrailserver restart +command:/usr/local/etc/rc.d/opnsense-maltrailserver restart parameters: type:script message:restarting Maltrail Server [status] -command:/usr/local/etc/rc.d/opnsense-maltrailserver status;exit 0 +command:/usr/local/etc/rc.d/opnsense-maltrailserver status; exit 0 parameters: type:script_output message:request Maltrail Server status diff --git a/security/maltrail/src/opnsense/service/templates/OPNsense/Maltrail/maltrailsensor b/security/maltrail/src/opnsense/service/templates/OPNsense/Maltrail/maltrailsensor index 6c3ffe4bb..f8af7a52e 100644 --- a/security/maltrail/src/opnsense/service/templates/OPNsense/Maltrail/maltrailsensor +++ b/security/maltrail/src/opnsense/service/templates/OPNsense/Maltrail/maltrailsensor @@ -1,5 +1,5 @@ {% if helpers.exists('OPNsense.maltrail.sensor.enabled') and OPNsense.maltrail.sensor.enabled == '1' %} -maltrailsensor_var_script="/usr/local/opnsense/scripts/OPNsense/Maltrail/setup.sh" +maltrailsensor_setup="/usr/local/opnsense/scripts/OPNsense/Maltrail/setup.sh" maltrailsensor_enable="YES" {% else %} maltrailsensor_enable="NO" diff --git a/security/maltrail/src/opnsense/service/templates/OPNsense/Maltrail/maltrailserver b/security/maltrail/src/opnsense/service/templates/OPNsense/Maltrail/maltrailserver index d62c5c997..9ddea01c6 100644 --- a/security/maltrail/src/opnsense/service/templates/OPNsense/Maltrail/maltrailserver +++ b/security/maltrail/src/opnsense/service/templates/OPNsense/Maltrail/maltrailserver @@ -1,5 +1,5 @@ {% if helpers.exists('OPNsense.maltrail.server.enabled') and OPNsense.maltrail.server.enabled == '1' %} -maltrailserver_var_script="/usr/local/opnsense/scripts/OPNsense/Maltrail/setup.sh" +maltrailserver_setup="/usr/local/opnsense/scripts/OPNsense/Maltrail/setup.sh" maltrailserver_enable="YES" {% else %} maltrailserver_enable="NO"