From 41df3865e61d589b3e12870435b6d14b7d77945e Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Thu, 18 Aug 2022 14:15:47 +0200 Subject: [PATCH] mail/postfix: migrate to NAME_setup use PR: https://github.com/opnsense/core/issues/5917 --- mail/postfix/Makefile | 2 +- .../opnsense/service/conf/actions.d/actions_postfix.conf | 8 ++++---- .../opnsense/service/templates/OPNsense/Postfix/postfix | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index cf53694a3..8ffb1be91 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -1,6 +1,6 @@ PLUGIN_NAME= postfix PLUGIN_VERSION= 1.23 -PLUGIN_REVISION= 2 +PLUGIN_REVISION= 3 PLUGIN_COMMENT= SMTP mail relay PLUGIN_DEPENDS= postfix35 PLUGIN_MAINTAINER= m.muenz@gmail.com diff --git a/mail/postfix/src/opnsense/service/conf/actions.d/actions_postfix.conf b/mail/postfix/src/opnsense/service/conf/actions.d/actions_postfix.conf index 6fcd216fa..b88e4e2e6 100644 --- a/mail/postfix/src/opnsense/service/conf/actions.d/actions_postfix.conf +++ b/mail/postfix/src/opnsense/service/conf/actions.d/actions_postfix.conf @@ -1,24 +1,24 @@ [start] -command:/usr/local/opnsense/scripts/OPNsense/Postfix/setup.sh;/usr/local/etc/rc.d/postfix start +command:/usr/local/etc/rc.d/postfix start parameters: type:script message:starting Postfix [stop] -command:/usr/local/etc/rc.d/postfix stop; exit 0 +command:/usr/local/etc/rc.d/postfix stop parameters: type:script message:stopping Postfix [restart] -command:/usr/local/opnsense/scripts/OPNsense/Postfix/setup.sh;/usr/local/etc/rc.d/postfix restart +command:/usr/local/etc/rc.d/postfix restart parameters: type:script message:restarting Postfix description:Restart Postfix service [status] -command:/usr/local/etc/rc.d/postfix status;exit 0 +command:/usr/local/etc/rc.d/postfix status; exit 0 parameters: type:script_output message:request Postfix status diff --git a/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/postfix b/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/postfix index 1d2cfd855..65720e2cc 100644 --- a/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/postfix +++ b/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/postfix @@ -1,5 +1,5 @@ {% if helpers.exists('OPNsense.postfix.general.enabled') and OPNsense.postfix.general.enabled == '1' %} -postfix_var_script="/usr/local/opnsense/scripts/OPNsense/Postfix/setup.sh" +postfix_setup="/usr/local/opnsense/scripts/OPNsense/Postfix/setup.sh" postfix_enable="YES" {% else %} postfix_enable="NO"