evoacme: fix constants check and autosigned cert
This commit is contained in:
parent
63565d0f01
commit
b884bdb1c9
|
@ -1,5 +1,11 @@
|
|||
#!/bin/bash
|
||||
|
||||
if [ -f /etc/default/evoacme ]; then
|
||||
source /etc/default/evoacme
|
||||
fi
|
||||
[ -z "${SSL_KEY_DIR}" ] && SSL_KEY_DIR='/etc/ssl/private'
|
||||
[ -z "${CSR_DIR}" ] && CSR_DIR='/etc/ssl/requests'
|
||||
[ -z "${SELF_SIGNED_DIR}" ] && SELF_SIGNED_DIR='/etc/ssl/self-signed'
|
||||
|
||||
shopt -s extglob
|
||||
|
||||
|
@ -26,7 +32,7 @@ fi
|
|||
SSL_KEY_SIZE=$(grep default_bits /etc/letsencrypt/openssl.cnf|cut -d'=' -f2|xargs)
|
||||
openssl genrsa -out $SSL_KEY_DIR/${vhost}.key $SSL_KEY_SIZE
|
||||
chown root: $SSL_KEY_DIR/${vhost}.key
|
||||
chmod 640 $SSL_KEY_DIR/${vhost}.key
|
||||
chmod 600 $SSL_KEY_DIR/${vhost}.key
|
||||
|
||||
nb=0
|
||||
|
||||
|
@ -64,8 +70,7 @@ else
|
|||
domains=$valid_domains
|
||||
fi
|
||||
|
||||
mkdir -p /etc/ssl/requests -m 755
|
||||
chown root: /etc/ssl/requests
|
||||
mkdir -p $CSR_DIR -m 0755
|
||||
|
||||
if [ $nb -eq 1 ]; then
|
||||
openssl req -new -sha256 -key $SSL_KEY_DIR/${vhost}.key -config <(cat /etc/letsencrypt/openssl.cnf <(printf "CN=$domain")) -out $CSR_DIR/${vhost}.csr
|
||||
|
@ -80,10 +85,10 @@ elif [ $nb -gt 1 ]; then
|
|||
fi
|
||||
|
||||
if [ -f $CSR_DIR/${vhost}.csr ]; then
|
||||
chown root: $CSR_DIR/${vhost}.csr
|
||||
chmod 644 $CSR_DIR/${vhost}.csr
|
||||
if [ ! -f $CRT_DIR/${vhost}-fullchain.pem ]; then
|
||||
echo "Generate autosigned cert"
|
||||
openssl x509 -req -sha256 -days 365 -in $CSR_DIR/${vhost}.csr -signkey $SSL_KEY_DIR/${vhost}.key -out $CRT_DIR/${vhost}-fullchain.pem
|
||||
mkdir -p $SELF_SIGNED_DIR -m 0755
|
||||
openssl x509 -req -sha256 -days 365 -in $CSR_DIR/${vhost}.csr -signkey $SSL_KEY_DIR/${vhost}.key -out $SELF_SIGNED_DIR/${vhost}.pem
|
||||
if [ -f $SELF_SIGNED_DIR/${vhost}.pem ]; then
|
||||
chmod 644 $SELF_SIGNED_DIR/${vhost}.pem
|
||||
fi
|
||||
fi
|
||||
|
|
Loading…
Reference in a new issue