This commit is contained in:
neil 2016-01-09 23:36:25 +08:00
parent 9a76ef2f32
commit b7b8311c3d

16
le.sh
View File

@ -237,6 +237,14 @@ _initpath() {
WORKING_DIR=$HOME/.le WORKING_DIR=$HOME/.le
fi fi
if [ -z "$ACME_DIR" ] ; then
ACME_DIR="/home/.acme"
fi
if [ -z "$APACHE_CONF_BACKUP_DIR" ] ; then
APACHE_CONF_BACKUP_DIR="$WORKING_DIR/"
fi
domain="$1" domain="$1"
mkdir -p "$WORKING_DIR" mkdir -p "$WORKING_DIR"
ACCOUNT_KEY_PATH="$WORKING_DIR/account.acc" ACCOUNT_KEY_PATH="$WORKING_DIR/account.acc"
@ -257,13 +265,7 @@ _initpath() {
CA_CERT_PATH="$WORKING_DIR/$domain/ca.cer" CA_CERT_PATH="$WORKING_DIR/$domain/ca.cer"
if [ -z "$ACME_DIR" ] ; then
ACME_DIR="/home/.acme"
fi
if [ -z "$APACHE_CONF_BACKUP_DIR" ] ; then
APACHE_CONF_BACKUP_DIR="$WORKING_DIR/"
fi
} }
@ -280,6 +282,7 @@ _apachePath() {
} }
_restoreApache() { _restoreApache() {
_initpath
if ! _apachePath ; then if ! _apachePath ; then
return 1 return 1
fi fi
@ -300,6 +303,7 @@ _restoreApache() {
} }
_setApache() { _setApache() {
_initpath
if ! _apachePath ; then if ! _apachePath ; then
return 1 return 1
fi fi