upstream/opnsense-plugins
1
0
Fork 0
mirror of https://github.com/opnsense/plugins.git synced 2026-05-28 04:34:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

mail/postfix: merge version 1.4 from master

Browse source
This commit is contained in:
Franco Fichtner 2018-07-01 12:15:52 +02:00
parent ebad58982a
commit ab1feb23c4
4 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mail/postfix/Makefile
View file

@ -1,5 +1,5 @@
PLUGIN_NAME= postfix
PLUGIN_VERSION= 1.3
PLUGIN_VERSION= 1.4
PLUGIN_COMMENT= SMTP mail relay
PLUGIN_DEPENDS= postfix-sasl
PLUGIN_MAINTAINER= m.muenz@gmail.com

7
mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/forms/general.xml
View file

@ -117,6 +117,13 @@
<type>password</type>
<help>The password to use for SMTP authentication.</help>
</field>
<field>
<id>general.enforce_recipient_check</id>
<label>Enforce Recipient Relay Check</label>
<type>checkbox</type>
<advanced>true</advanced>
<help>If you enable this, every entry in Recipients will be checked against. When there is no match mail will be rejected. Be aware that it does not matter if the action is "OK" or "REJECT". This setup allows you to run postfix in front of an internal system and already rejecting unsolicited mail at the border.</help>
</field>
<field>
<id>general.reject_unauth_pipelining</id>
<label>Reject Unauthenticated Pipelining</label>

6
mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/General.xml
View file

@ -1,7 +1,7 @@
<model>
<mount>//OPNsense/postfix/general</mount>
<description>Postfix configuration</description>
<version>1.2.0</version>
<version>1.2.1</version>
<items>
<enabled type="BooleanField">
<default>0</default>
@ -85,6 +85,10 @@
<default></default>
<Required>N</Required>
</smtpauth_password>
<enforce_recipient_check type="BooleanField">
<default>0</default>
<Required>Y</Required>
</enforce_recipient_check>
<reject_unauth_pipelining type="BooleanField">
<default>1</default>
<Required>Y</Required>

4
mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/main.cf
View file

@ -112,6 +112,10 @@ milter_mail_macros = i {mail_addr} {client_addr} {client_name} {auth_authen}
milter_default_action = accept
{% endif %}
{% if helpers.exists('OPNsense.postfix.general.enforce_recipient_check') and OPNsense.postfix.general.enforce_recipient_check == '1' %}
relay_recipient_maps = hash:/usr/local/etc/postfix/recipient_access
{% endif %}
{# Sender Restrictions #}
{% set smtpd_recipient_restrictions=[] %}
{% if helpers.exists('OPNsense.postfix.recipient.recipients.recipient') %}