nihilist/acme.sh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support HAPROXY_DEPLOY_PEM_PATH

Browse Source 
Adds compatibility to original haproxy deploy hook while still allowing custom PEM file name (via HAPROXY_DEPLOY_PEM_NAME)
This commit is contained in:
andrewheberle 2018-05-10 15:25:28 +08:00 committed by GitHub
parent 707e053949
commit ba20af48d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
deploy/haproxy.sh
View File

@ -4,9 +4,15 @@
# #
# The following variables can be exported: # The following variables can be exported:
# #
# export DEPLOY_HAPROXY_PEM="" # export DEPLOY_HAPROXY_PEM_NAME="${domain}.pem"
# #
# REQUIRED: Defines location of PEM file for HAProxy # Defines the name of the PEM file.
# Defaults to "domain.pem"
#
# export DEPLOY_HAPROXY_PEM_PATH="/etc/haproxy"
#
# Defines location of PEM file for HAProxy.
# Defaults to /etc/haproxy
# #
# export DEPLOY_HAPROXY_RELOAD="systemctl reload haproxy" # export DEPLOY_HAPROXY_RELOAD="systemctl reload haproxy"
# #
@ -39,6 +45,8 @@ haproxy_deploy() {
_cfullchain="$5" _cfullchain="$5"
# Some defaults # Some defaults
DEPLOY_HAPROXY_PEM_PATH_DEFAULT="/etc/haproxy"
DEPLOY_HAPROXY_PEM_NAME_DEFAULT="${_cdomain}.pem"
DEPLOY_HAPROXY_BUNDLE_DEFAULT="no" DEPLOY_HAPROXY_BUNDLE_DEFAULT="no"
DEPLOY_HAPROXY_ISSUER_DEFAULT="no" DEPLOY_HAPROXY_ISSUER_DEFAULT="no"
DEPLOY_HAPROXY_RELOAD_DEFAULT="systemctl reload haproxy" DEPLOY_HAPROXY_RELOAD_DEFAULT="systemctl reload haproxy"
@ -54,15 +62,28 @@ haproxy_deploy() {
_debug _cca "${_cca}" _debug _cca "${_cca}"
_debug _cfullchain "${_cfullchain}" _debug _cfullchain "${_cfullchain}"
# CERT is required # PEM_PATH is optional. If not provided then assume "${DEPLOY_HAPROXY_PEM_PATH_DEFAULT}"
if [ -z "${DEPLOY_HAPROXY_PEM}" ]; then if [ -n "${DEPLOY_HAPROXY_PEM_PATH}" ]; then
if [ -z "${Le_Deploy_haproxy_pem}" ]; then Le_Deploy_haproxy_pem_path="${DEPLOY_HAPROXY_PEM_PATH}"
_err "{DEPLOY_HAPROXY_PEM} not defined." _savedomainconf Le_Deploy_haproxy_pem_path "${Le_Deploy_haproxy_pem_path}"
elif [ -z "${Le_Deploy_haproxy_pem_path}" ]; then
Le_Deploy_haproxy_pem_path="${DEPLOY_HAPROXY_PEM_PATH_DEFAULT}"
fi
# Ensure PEM_PATH exists
if [ -d "${Le_Deploy_haproxy_pem_path}" ]; then
_debug "PEM_PATH ${Le_Deploy_haproxy_pem_path} exists"
else
_err "PEM_PATH ${Le_Deploy_haproxy_pem_path} does not exist"
return 1 return 1
fi fi
else
Le_Deploy_haproxy_pem="${DEPLOY_HAPROXY_PEM}" # PEM_NAME is optional. If not provided then assume "${DEPLOY_HAPROXY_PEM_NAME_DEFAULT}"
_savedomainconf Le_Deploy_haproxy_pem "${Le_Deploy_haproxy_pem}" if [ -n "${DEPLOY_HAPROXY_PEM_NAME}" ]; then
Le_Deploy_haproxy_pem_name="${DEPLOY_HAPROXY_PEM_NAME}"
_savedomainconf Le_Deploy_haproxy_pem_name "${Le_Deploy_haproxy_pem_name}"
elif [ -z "${Le_Deploy_haproxy_pem_name}" ]; then
Le_Deploy_haproxy_pem_name="${DEPLOY_HAPROXY_PEM_NAME_DEFAULT}"
fi fi
# BUNDLE is optional. If not provided then assume "${DEPLOY_HAPROXY_BUNDLE_DEFAULT}" # BUNDLE is optional. If not provided then assume "${DEPLOY_HAPROXY_BUNDLE_DEFAULT}"
@ -108,7 +129,7 @@ haproxy_deploy() {
fi fi
# Set variables for later # Set variables for later
_pem="${Le_Deploy_haproxy_pem}${_suffix}" _pem="${Le_Deploy_haproxy_pem_path}/${Le_Deploy_haproxy_pem_name}${_suffix}"
_issuer="${_pem}.issuer" _issuer="${_pem}.issuer"
_ocsp="${_pem}.ocsp" _ocsp="${_pem}.ocsp"
_reload="${Le_Deploy_haproxy_reload}" _reload="${Le_Deploy_haproxy_reload}"