Add --cert-name option
parent
a0b27ddbd8
commit
f75e4d7db8
30
acme.sh
30
acme.sh
|
@ -2827,9 +2827,15 @@ _initpath() {
|
|||
return 0
|
||||
fi
|
||||
|
||||
if [ -z "$_certname" ]; then
|
||||
CERT_NAME="$domain"
|
||||
else
|
||||
CERT_NAME="$_certname"
|
||||
fi
|
||||
|
||||
if [ -z "$DOMAIN_PATH" ]; then
|
||||
domainhome="$CERT_HOME/$domain"
|
||||
domainhomeecc="$CERT_HOME/$domain$ECC_SUFFIX"
|
||||
domainhome="$CERT_HOME/$CERT_NAME"
|
||||
domainhomeecc="$CERT_HOME/$CERT_NAME$ECC_SUFFIX"
|
||||
|
||||
DOMAIN_PATH="$domainhome"
|
||||
|
||||
|
@ -2848,21 +2854,21 @@ _initpath() {
|
|||
fi
|
||||
|
||||
if [ -z "$DOMAIN_CONF" ]; then
|
||||
DOMAIN_CONF="$DOMAIN_PATH/$domain.conf"
|
||||
DOMAIN_CONF="$DOMAIN_PATH/$CERT_NAME.conf"
|
||||
fi
|
||||
|
||||
if [ -z "$DOMAIN_SSL_CONF" ]; then
|
||||
DOMAIN_SSL_CONF="$DOMAIN_PATH/$domain.csr.conf"
|
||||
DOMAIN_SSL_CONF="$DOMAIN_PATH/$CERT_NAME.csr.conf"
|
||||
fi
|
||||
|
||||
if [ -z "$CSR_PATH" ]; then
|
||||
CSR_PATH="$DOMAIN_PATH/$domain.csr"
|
||||
CSR_PATH="$DOMAIN_PATH/$CERT_NAME.csr"
|
||||
fi
|
||||
if [ -z "$CERT_KEY_PATH" ]; then
|
||||
CERT_KEY_PATH="$DOMAIN_PATH/$domain.key"
|
||||
CERT_KEY_PATH="$DOMAIN_PATH/$CERT_NAME.key"
|
||||
fi
|
||||
if [ -z "$CERT_PATH" ]; then
|
||||
CERT_PATH="$DOMAIN_PATH/$domain.cer"
|
||||
CERT_PATH="$DOMAIN_PATH/$CERT_NAME.cer"
|
||||
fi
|
||||
if [ -z "$CA_CERT_PATH" ]; then
|
||||
CA_CERT_PATH="$DOMAIN_PATH/ca.cer"
|
||||
|
@ -2871,10 +2877,10 @@ _initpath() {
|
|||
CERT_FULLCHAIN_PATH="$DOMAIN_PATH/fullchain.cer"
|
||||
fi
|
||||
if [ -z "$CERT_PFX_PATH" ]; then
|
||||
CERT_PFX_PATH="$DOMAIN_PATH/$domain.pfx"
|
||||
CERT_PFX_PATH="$DOMAIN_PATH/$CERT_NAME.pfx"
|
||||
fi
|
||||
if [ -z "$CERT_PKCS8_PATH" ]; then
|
||||
CERT_PKCS8_PATH="$DOMAIN_PATH/$domain.pkcs8"
|
||||
CERT_PKCS8_PATH="$DOMAIN_PATH/$CERT_NAME.pkcs8"
|
||||
fi
|
||||
|
||||
if [ -z "$TLS_CONF" ]; then
|
||||
|
@ -6898,6 +6904,7 @@ Parameters:
|
|||
--accountconf <file> Specifies a customized account config file.
|
||||
--home <directory> Specifies the home dir for $PROJECT_NAME.
|
||||
--cert-home <directory> Specifies the home dir to save all the certs, only valid for '--install' command.
|
||||
--cert-name <name> Specifies the name of the dir and base filenames of the certs, only valid for '--issue' command.
|
||||
--config-home <directory> Specifies the home dir to save all the configurations.
|
||||
--useragent <string> Specifies the user agent string. it will be saved for future use too.
|
||||
-m, --email <email> Specifies the account email, only valid for the '--install' and '--update-account' command.
|
||||
|
@ -7185,6 +7192,7 @@ _process() {
|
|||
_accountemail=""
|
||||
_accountkey=""
|
||||
_certhome=""
|
||||
_certname=""
|
||||
_confighome=""
|
||||
_httpport=""
|
||||
_tlsport=""
|
||||
|
@ -7504,6 +7512,10 @@ _process() {
|
|||
export CERT_HOME="$_certhome"
|
||||
shift
|
||||
;;
|
||||
--cert-name | --certname)
|
||||
_certname="$2"
|
||||
shift
|
||||
;;
|
||||
--config-home)
|
||||
_confighome="$2"
|
||||
export LE_CONFIG_HOME="$_confighome"
|
||||
|
|
Loading…
Reference in New Issue