|
@@ -184,13 +184,14 @@ 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
|
191
|
192
|
USE_LETSENCRYPT="$2"
|
192
|
193
|
fi
|
193
|
|
- if [[ $USE_LETSENCRYPT == 'no' ]]; then
|
|
194
|
+ if [[ $USE_LETSENCRYPT == 'no' || "$ONION_ONLY" != 'no' ]]; then
|
194
|
195
|
if [ ! -f "/etc/ssl/private/${1}.key" ]; then
|
195
|
196
|
echo $"Private certificate for ${CHECK_HOSTNAME} was not created"
|
196
|
197
|
exit 63959
|
|
@@ -239,17 +240,27 @@ function cert_exists {
|
239
|
240
|
}
|
240
|
241
|
|
241
|
242
|
function create_self_signed_cert {
|
|
243
|
+ if [ ! "${SITE_DOMAIN_NAME}" ]; then
|
|
244
|
+ echo $'No site domain specified for self signed cert'
|
|
245
|
+ exit 4638565385
|
|
246
|
+ fi
|
242
|
247
|
"${PROJECT_NAME}-addcert" -h "${SITE_DOMAIN_NAME}" --dhkey "${DH_KEYLENGTH}"
|
243
|
248
|
function_check check_certificates
|
244
|
249
|
check_certificates "${SITE_DOMAIN_NAME}"
|
245
|
250
|
}
|
246
|
251
|
|
247
|
252
|
function create_letsencrypt_cert {
|
|
253
|
+ if [ ! "${SITE_DOMAIN_NAME}" ]; then
|
|
254
|
+ echo $'No site domain specified for letsencrypt cert'
|
|
255
|
+ exit 246824624
|
|
256
|
+ fi
|
|
257
|
+
|
248
|
258
|
if ! "${PROJECT_NAME}-addcert" -e "${SITE_DOMAIN_NAME}" -s "${LETSENCRYPT_SERVER}" --dhkey "${DH_KEYLENGTH}" --email "${MY_EMAIL_ADDRESS}"; then
|
249
|
259
|
if [[ ${NO_SELF_SIGNED} == 'no' ]]; then
|
250
|
260
|
echo $"Lets Encrypt failed for ${SITE_DOMAIN_NAME}, so try making a self-signed cert"
|
251
|
261
|
"${PROJECT_NAME}-addcert" -h "${SITE_DOMAIN_NAME}" --dhkey "${DH_KEYLENGTH}"
|
252
|
262
|
function_check check_certificates
|
|
263
|
+ CHECK_HOSTNAME="${SITE_DOMAIN_NAME}"
|
253
|
264
|
check_certificates "${SITE_DOMAIN_NAME}"
|
254
|
265
|
else
|
255
|
266
|
echo $"Lets Encrypt failed for $SITE_DOMAIN_NAME"
|
|
@@ -263,6 +274,7 @@ function create_letsencrypt_cert {
|
263
|
274
|
fi
|
264
|
275
|
|
265
|
276
|
function_check check_certificates
|
|
277
|
+ CHECK_HOSTNAME="${SITE_DOMAIN_NAME}"
|
266
|
278
|
check_certificates "${SITE_DOMAIN_NAME}" 'yes'
|
267
|
279
|
}
|
268
|
280
|
|
|
@@ -1004,6 +1016,7 @@ function email_install_tls {
|
1004
|
1016
|
fi
|
1005
|
1017
|
if [ ! -f /etc/ssl/certs/exim.dhparam ]; then
|
1006
|
1018
|
"${PROJECT_NAME}-addcert" -h exim --dhkey "$DH_KEYLENGTH"
|
|
1019
|
+ CHECK_HOSTNAME=exim
|
1007
|
1020
|
check_certificates exim
|
1008
|
1021
|
cp /etc/ssl/certs/exim.dhparam /etc/exim4
|
1009
|
1022
|
chown root:Debian-exim /etc/exim4/exim.dhparam
|