From 6592f437201dd6ce637d80976b3d6f1bb3d3fe2d Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Thu, 30 Nov 2017 07:42:35 +0100 Subject: [PATCH] mail/postfix: merge version 0.2 from master --- mail/postfix/Makefile | 2 +- .../src/opnsense/scripts/OPNsense/Postfix/setup.sh | 11 +++++++++++ .../service/templates/OPNsense/Postfix/main.cf | 5 +++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index fb4cdc37b..47d3ecec4 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -1,5 +1,5 @@ PLUGIN_NAME= postfix -PLUGIN_VERSION= 0.1 +PLUGIN_VERSION= 0.2 PLUGIN_COMMENT= SMTP mail relay PLUGIN_DEPENDS= postfix-sasl PLUGIN_MAINTAINER= m.muenz@gmail.com diff --git a/mail/postfix/src/opnsense/scripts/OPNsense/Postfix/setup.sh b/mail/postfix/src/opnsense/scripts/OPNsense/Postfix/setup.sh index f588dedd9..6361465ed 100755 --- a/mail/postfix/src/opnsense/scripts/OPNsense/Postfix/setup.sh +++ b/mail/postfix/src/opnsense/scripts/OPNsense/Postfix/setup.sh @@ -31,4 +31,15 @@ postmap /usr/local/etc/postfix/transport postmap /usr/local/etc/postfix/recipient_access postmap /usr/local/etc/postfix/sender_access +# Check for aliases +if [ -f /usr/local/etc/postfix/aliases ]; then + echo "Updating aliases" + /usr/local/bin/newaliases +else + echo "Adding aliases" + touch /usr/local/etc/postfix/aliases + /usr/local/bin/newaliases +fi + + /usr/local/opnsense/scripts/OPNsense/Postfix/generate_certs.php diff --git a/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/main.cf b/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/main.cf index 853266808..e9596102d 100644 --- a/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/main.cf +++ b/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/main.cf @@ -3,6 +3,8 @@ ########################## # START SYSTEM DEFAULTS ########################## +alias_database = hash:/usr/local/etc/postfix/aliases +alias_maps = hash:/usr/local/etc/postfix/aliases compatibility_level = 2 queue_directory = /var/spool/postfix command_directory = /usr/local/sbin @@ -136,4 +138,7 @@ smtpd_recipient_restrictions = {{ smtpd_recipient_restrictions | join(', ') }} smtpd_helo_required = yes +### Syslog tweak, will be removed before stable +syslog_facility = security + {% endif %}