Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package opensuse-postfix-image for
openSUSE:Factory checked in at 2022-07-13 13:45:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/opensuse-postfix-image (Old)
and /work/SRC/openSUSE:Factory/.opensuse-postfix-image.new.1523 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opensuse-postfix-image"
Wed Jul 13 13:45:34 2022 rev:9 rq:988906 version:1.0.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/opensuse-postfix-image/opensuse-postfix-image.changes
2021-08-03 22:48:38.808503676 +0200
+++
/work/SRC/openSUSE:Factory/.opensuse-postfix-image.new.1523/opensuse-postfix-image.changes
2022-07-13 13:45:59.510083215 +0200
@@ -1,0 +2,9 @@
+Wed Jul 13 07:01:43 UTC 2022 - [email protected]
+
+- Update to version 20220713.c55a107:
+ * Document ENABLE_SUBMISSIONS variable
+ * Add smtps port
+ * Add support for smtps
+ * Add support for submission port 587
+
+-------------------------------------------------------------------
New:
----
_servicedata
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ opensuse-postfix-image.kiwi ++++++
--- /var/tmp/diff_new_pack.VFQU2Q/_old 2022-07-13 13:46:00.050083982 +0200
+++ /var/tmp/diff_new_pack.VFQU2Q/_new 2022-07-13 13:46:00.054083987 +0200
@@ -23,6 +23,7 @@
</subcommand>
<expose>
<port number='25'/>
+ <port number='465'/>
<port number='587'/>
</expose>
<volumes>
@@ -63,6 +64,7 @@
<package name="ca-certificates-mozilla"/>
<package name="spamassassin-spamc"/>
<package name="spamass-milter"/>
+ <package name="timezone"/>
<package name="-busybox-man"/>
<package name="-busybox-sendmail"/>
<package name="-busybox-iproute2"/>
++++++ README.md ++++++
--- /var/tmp/diff_new_pack.VFQU2Q/_old 2022-07-13 13:46:00.114084072 +0200
+++ /var/tmp/diff_new_pack.VFQU2Q/_new 2022-07-13 13:46:00.118084078 +0200
@@ -48,6 +48,13 @@
- `SMTP_TLS_SECURITY_LEVEL` SMTP TLS security level. The default is `may`.
- `LMTP=host` Host on which the lmtp service is running. This will
disable the usage of the vmail user account.
+### Accepting mails on port 587 (submission) and 465 (submissions/smtps)
+- `ENABLE_SUBMISSION=[0|1]` Enable submission port. The default is `0`.
+- `ENABLE_SUBMISSIONS=[0|1]` Enable submissions/smtps port. This requires
`SMTPD_USE_TLS=1`. The default is `0`.
+- `SMTPD_USE_TLS=[0|1]` Enforce TLS. The default is `0`.
+- `SMTPD_TLS_CRT=` Path to certificate, default
`/etc/postfix/ssl/certs/tls.crt`
+- `SMTPD_TLS_KEY=` Path to public key, default
`/etc/postfix/ssl/certs/tls.key`
+
### Activate additional checks
- `SPAMASSASSIN_HOST` Host on which spamd is running. Enables Spam checking.
++++++ _service ++++++
--- /var/tmp/diff_new_pack.VFQU2Q/_old 2022-07-13 13:46:00.146084118 +0200
+++ /var/tmp/diff_new_pack.VFQU2Q/_new 2022-07-13 13:46:00.150084123 +0200
@@ -1,13 +1,18 @@
<services>
<service name="obs_scm" mode="disabled">
- <param
name="url">https://github.com/thkukuk/containers-mailserver.git</param>
<param name="scm">git</param>
- <param name="extract">LICENSE</param>
- <param name="extract">postfix/README.md</param>
- <param name="extract">postfix/opensuse-postfix-image.kiwi</param>
- <param name="extract">postfix/opensuse-postfix-image.changes</param>
+ <param
name="url">https://github.com/thkukuk/containers-mailserver.git</param>
<param name="revision">master</param>
<param name="versionformat">%cd.%h</param>
+ <param name="subdir">postfix</param>
+ <param name="extract">README.md</param>
+ <param name="extract">opensuse-postfix-image.kiwi</param>
+ <param name="changesgenerate">enable</param>
+ </service>
+ <service name="obs_scm" mode="disabled">
+ <param name="scm">git</param>
+ <param
name="url">https://github.com/thkukuk/containers-mailserver.git</param>
+ <param name="extract">LICENSE</param>
</service>
<service name="tar" mode="disabled">
<param name="subdir">postfix</param>
++++++ _servicedata ++++++
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/thkukuk/container-mailserver.git</param>
</service>
<service name="tar_scm">
<param
name="url">https://github.com/thkukuk/containers-mailserver.git</param>
<param
name="changesrevision">c55a10794649e86260e2a2f738954c771d61fc17</param></service></servicedata>
(No newline at EOF)
++++++ entrypoint.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/entrypoint/entrypoint.sh new/entrypoint/entrypoint.sh
--- old/entrypoint/entrypoint.sh 2021-01-22 13:35:14.000000000 +0100
+++ new/entrypoint/entrypoint.sh 2022-07-13 08:54:19.000000000 +0200
@@ -7,6 +7,8 @@
VIRTUAL_MBOX=${VIRTUAL_MBOX:-"0"}
USE_LDAP=${USE_LDAP:-"0"}
NULLCLIENT=${NULLCLIENT:-"1"}
+ENABLE_SUBMISSION=${ENABLE_SUBMISSION:-"0"}
+ENABLE_SUBMISSIONS=${ENABLE_SUBMISSIONS:-"0"}
export PATH=/usr/sbin:/sbin:${PATH}
@@ -157,6 +159,48 @@
fi
}
+setup_submission() {
+ SMTPD_USE_TLS=${SMTPD_USE_TLS:-"0"}
+
+ if [ "${ENABLE_SUBMISSION}" -eq "1" ]; then
+ echo "Enable submission port"
+
+ echo "submission inet n - n - - smtpd" >>
/etc/postfix/master.cf
+ echo " -o syslog_name=postfix/submission" >> /etc/postfix/master.cf
+
+ if [ "${SMTPD_USE_TLS}" -eq "1" ]; then
+ echo " -o smtpd_tls_security_level=encrypt" >>
/etc/postfix/master.cf
+ echo " -o smtpd_sasl_auth_enable=no" >> /etc/postfix/master.cf
+ #echo " -o
smtpd_client_restrictions=permit_sasl_authenticated,reject" >>
/etc/postfix/master.cf
+ fi
+ fi
+
+ if [ "${ENABLE_SUBMISSIONS}" -eq "1" ]; then
+ if [ "${SMTPD_USE_TLS}" -eq "1" ]; then
+ echo "Enable submissions port"
+
+ echo "smtps inet n - n - - smtpd" >>
/etc/postfix/master.cf
+ echo " -o syslog_name=postfix/smtps" >> /etc/postfix/master.cf
+ echo " -o smtpd_tls_wrappermode=yes" >> /etc/postfix/master.cf
+ echo " -o smtpd_sasl_auth_enable=no" >> /etc/postfix/master.cf
+ else
+ echo "WARNING: ENABLE_SUBMISSIONS requires SMTPD_USE_TLS, ignoring!"
+ fi
+ fi
+
+ if [ "${SMTPD_USE_TLS}" -eq "1" ]; then
+ echo "Enable TLS for smtpd"
+
+ SMTPD_TLS_CRT=${SMTPD_TLS_CRT:-"/etc/postfix/ssl/certs/tls.crt"}
+ SMTPD_TLS_KEY=${SMTPD_TLS_KEY:-"/etc/postfix/ssl/certs/tls.key"}
+
+ set_config_value "smtpd_use_tls" "yes"
+ set_config_value "smtpd_tls_CApath" "/etc/ssl/certs"
+ set_config_value "smtpd_tls_cert_file" "${SMTPD_TLS_CRT}"
+ set_config_value "smtpd_tls_key_file" "${SMTPD_TLS_KEY}"
+ fi
+}
+
setup_vhosts() {
if [ "${USE_LDAP}" -eq "1" ]; then
LDAP_BASE_DN=${LDAP_BASE_DN:-"dc=example,dc=org"}
@@ -294,7 +338,7 @@
else
set_config_value "mydestination" "\$myhostname, localhost.\$mydomain,
localhost"
fi
-
+ setup_submission
setup_relayhost
# Add maps to config and create database
@@ -304,7 +348,7 @@
done
set_config_value "smtpd_sender_restrictions" "lmdb:/etc/postfix/access"
# Generate and update maps
- update_db access relay
+ update_db access relay relay_recipients
setup_aliases
}
@@ -339,7 +383,6 @@
stop_postfix() {
- echo "XXX sec=$1 XXX"
typeset -i sec=$1
typeset -i ms=$((sec*100))
