Commit 824d9c5e authored by Paul Cammish's avatar Paul Cammish
Browse files

Merge branch 'buster-testing' into 'buster'

buster testing -> buster

See merge request sympl/sympl!90
parents be95cfb7 1696ecf1
sympl-mail (10.0.190707.0) stable; urgency=medium
* Fixed unhandled input
-- Paul Cammish <sympl@kelduum.net> Sun, 07 Jul 2019 20:59:13 +0100
sympl-mail (10.0.190706.1) stable; urgency=medium
* Resolved potential race condition
-- Paul Cammish <sympl@kelduum.net> Sun, 06 Jul 2019 21:26:12 +0100
-- Paul Cammish <sympl@kelduum.net> Sat, 06 Jul 2019 21:26:12 +0100
sympl-mail (10.0.190706.0) stable; urgency=medium
* Updated sympl-mail-dovecot-sni for edge cases
......@@ -101,8 +107,8 @@ symbiosis-email (2018:0807) stable; urgency=medium
symbiosis-email (2018:0615) stable; urgency=medium
* Set 'keep_environment' in Exim config.
* Only restart clamav in postinst when 'antivirus' file present.
* Set 'keep_environment' in Exim config.
* Only restart clamav in postinst when 'antivirus' file present.
-- Andrew Ladlow <andrew.ladlow@bytemark.co.uk> Fri, 15 Jun 2018 13:15:08 +0100
......@@ -143,7 +149,7 @@ symbiosis-email (2015:1218) oldstable; urgency=medium
* Re-instate clamav tests that stop it if no domains are using anti-virus
scanning. Closes #49.
* Fix path to binary in /etc/cron.d/symbiosis-email. Closes #72.
* Fix path to binary in /etc/cron.d/symbiosis-email. Closes #72.
* Ensure manpages are built
-- Patrick J Cherry <patrick@bytemark.co.uk> Thu, 13 Jul 2017 15:13:30 +0100
......
......@@ -2,7 +2,7 @@
set -e
if [ ! -L /srv/*/config/ssl/current ]; then
if [ ! -L '/srv/*/config/ssl/current' ]; then
# No certs avaialable, so check if /etc/dovecot/sympl.d/10-main/60-sni exists
if [ -f /etc/dovecot/sympl.d/10-main/60-sni ]; then
# it exists, so remove it
......@@ -21,7 +21,7 @@ if [ ! -L /srv/*/config/ssl/current ]; then
fi
fi
for certificate in $( find -L /srv/*/config/ssl/current -name 'ssl.crt' -print ); do
for certificate in $( find -L '/srv/*/config/ssl/current' -name 'ssl.crt' -print ); do
certpath="$( echo $certificate | sed 's|/config/ssl/current/.*$|/config/ssl/current|' )"
# Ensure there is a matching key file, and the path doesnt include an underscore
if [ -f "${certpath}/ssl.key" ] && [ -f "${certpath}/ssl.bundle" ] && [ "$certpath" != "*_*" ] ; then
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment