mirror of
https://github.com/plantroon/acme.sh.git
synced 2024-12-25 14:41:40 +00:00
minor, set paths via env vars
This commit is contained in:
parent
4b853d3c1e
commit
889dbbc092
36
le.sh
36
le.sh
@ -253,7 +253,10 @@ _initpath() {
|
|||||||
|
|
||||||
domain="$1"
|
domain="$1"
|
||||||
mkdir -p "$WORKING_DIR"
|
mkdir -p "$WORKING_DIR"
|
||||||
ACCOUNT_KEY_PATH="$WORKING_DIR/account.acc"
|
|
||||||
|
if [ -z "$ACCOUNT_KEY_PATH" ] ; then
|
||||||
|
ACCOUNT_KEY_PATH="$WORKING_DIR/account.acc"
|
||||||
|
fi
|
||||||
|
|
||||||
if [ -z "$domain" ] ; then
|
if [ -z "$domain" ] ; then
|
||||||
return 0
|
return 0
|
||||||
@ -261,16 +264,21 @@ _initpath() {
|
|||||||
|
|
||||||
mkdir -p "$WORKING_DIR/$domain"
|
mkdir -p "$WORKING_DIR/$domain"
|
||||||
|
|
||||||
DOMAIN_CONF="$WORKING_DIR/$domain/$Le_Domain.conf"
|
if [ -z "$DOMAIN_CONF" ] ; then
|
||||||
|
DOMAIN_CONF="$WORKING_DIR/$domain/$Le_Domain.conf"
|
||||||
CSR_PATH="$WORKING_DIR/$domain/$domain.csr"
|
fi
|
||||||
|
if [ -z "$CSR_PATH" ] ; then
|
||||||
CERT_KEY_PATH="$WORKING_DIR/$domain/$domain.key"
|
CSR_PATH="$WORKING_DIR/$domain/$domain.csr"
|
||||||
|
fi
|
||||||
CERT_PATH="$WORKING_DIR/$domain/$domain.cer"
|
if [ -z "$CERT_KEY_PATH" ] ; then
|
||||||
|
CERT_KEY_PATH="$WORKING_DIR/$domain/$domain.key"
|
||||||
CA_CERT_PATH="$WORKING_DIR/$domain/ca.cer"
|
fi
|
||||||
|
if [ -z "$CERT_PATH" ] ; then
|
||||||
|
CERT_PATH="$WORKING_DIR/$domain/$domain.cer"
|
||||||
|
fi
|
||||||
|
if [ -z "$CA_CERT_PATH" ] ; then
|
||||||
|
CA_CERT_PATH="$WORKING_DIR/$domain/ca.cer"
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -695,6 +703,12 @@ renewAll() {
|
|||||||
|
|
||||||
Le_ReloadCmd=""
|
Le_ReloadCmd=""
|
||||||
|
|
||||||
|
DOMAIN_CONF=""
|
||||||
|
CSR_PATH=""
|
||||||
|
CERT_KEY_PATH=""
|
||||||
|
CERT_PATH=""
|
||||||
|
CA_CERT_PATH=""
|
||||||
|
ACCOUNT_KEY_PATH=""
|
||||||
renew "$d"
|
renew "$d"
|
||||||
done
|
done
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user