Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Ian Eiloart
Sympl
Commits
36ce53c0
Commit
36ce53c0
authored
Jul 08, 2019
by
Paul Cammish
Browse files
Update mail/sbin/sympl-mail-dovecot-sni, mail/debian/changelog files
parent
1696ecf1
Changes
2
Hide whitespace changes
Inline
Side-by-side
mail/debian/changelog
View file @
36ce53c0
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
...
...
mail/sbin/sympl-mail-dovecot-sni
View file @
36ce53c0
...
...
@@ -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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment