|
@@ -184,7 +184,8 @@ function test_domain_name {
|
184
|
184
|
# Checks whether certificates were generated for the given hostname
|
185
|
185
|
function check_certificates {
|
186
|
186
|
if [ ! "$1" ]; then
|
187
|
|
- return
|
|
187
|
+ echo $'No certificate name provided'
|
|
188
|
+ exit 3568736585683
|
188
|
189
|
fi
|
189
|
190
|
USE_LETSENCRYPT='no'
|
190
|
191
|
if [ "$2" ]; then
|
|
@@ -259,6 +260,7 @@ function create_letsencrypt_cert {
|
259
|
260
|
echo $"Lets Encrypt failed for ${SITE_DOMAIN_NAME}, so try making a self-signed cert"
|
260
|
261
|
"${PROJECT_NAME}-addcert" -h "${SITE_DOMAIN_NAME}" --dhkey "${DH_KEYLENGTH}"
|
261
|
262
|
function_check check_certificates
|
|
263
|
+ CHECK_HOSTNAME="${SITE_DOMAIN_NAME}"
|
262
|
264
|
check_certificates "${SITE_DOMAIN_NAME}"
|
263
|
265
|
else
|
264
|
266
|
echo $"Lets Encrypt failed for $SITE_DOMAIN_NAME"
|
|
@@ -272,6 +274,7 @@ function create_letsencrypt_cert {
|
272
|
274
|
fi
|
273
|
275
|
|
274
|
276
|
function_check check_certificates
|
|
277
|
+ CHECK_HOSTNAME="${SITE_DOMAIN_NAME}"
|
275
|
278
|
check_certificates "${SITE_DOMAIN_NAME}" 'yes'
|
276
|
279
|
}
|
277
|
280
|
|
|
@@ -1013,6 +1016,7 @@ function email_install_tls {
|
1013
|
1016
|
fi
|
1014
|
1017
|
if [ ! -f /etc/ssl/certs/exim.dhparam ]; then
|
1015
|
1018
|
"${PROJECT_NAME}-addcert" -h exim --dhkey "$DH_KEYLENGTH"
|
|
1019
|
+ CHECK_HOSTNAME=exim
|
1016
|
1020
|
check_certificates exim
|
1017
|
1021
|
cp /etc/ssl/certs/exim.dhparam /etc/exim4
|
1018
|
1022
|
chown root:Debian-exim /etc/exim4/exim.dhparam
|