Commit 23c0c428 authored by Paul Cammish's avatar Paul Cammish
Browse files

Merge branch 'buster-testing' into 'buster'

buster testing -> buster

See merge request sympl/sympl!96
parents 824d9c5e 614f92d0
......@@ -20,6 +20,9 @@ stages:
- git describe --all
- echo "Building '$CI_BUILD_NAME' in directory '$PACKAGE'"
- cd $PACKAGE
- dpkg-parsechangelog 2> /tmp/error
- cat /tmp/error
- if [ -s /tmp/error ]; then exit 1; fi
- dpkg-buildpackage --no-sign --build=full
- cd ..
- mkdir deb
......
sympl-mail (10.0.190708.0) stable; urgency=medium
* Re-enable Dovecot SNI
-- Paul Cammish <sympl@kelduum.net> Mon, 08 Jul 2019 22:13:14 +0100
sympl-mail (10.0.190707.0) stable; urgency=medium
* Fixed unhandled input
......
......@@ -2,7 +2,7 @@
set -e
if [ ! -L '/srv/*/config/ssl/current' ]; then
if [ "$( find -L /srv -mindepth 5 -maxdepth 5 -name 'ssl.crt' -path '*/config/ssl/current/*' -print | wc -l )" == "0" ]; 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 -mindepth 5 -maxdepth 5 -name 'ssl.crt' -path '*/config/ssl/current/*' -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