Browse Source

Fix strongswan deploy hook

Make it more resistant to deploy hooks api change by passing custom arguments first
pull/6697/head
Sergey Parfenov 2 weeks ago
parent
commit
00aaed1b14
  1. 18
      deploy/strongswan.sh

18
deploy/strongswan.sh

@ -33,7 +33,7 @@ strongswan_deploy() {
return 1 return 1
fi fi
_info _confdir "${_confdir}" _info _confdir "${_confdir}"
__deploy_cert "$@" "stroke" "${_confdir}"
__deploy_cert "stroke" "${_confdir}" "$@"
${_ipsec} reload ${_ipsec} reload
fi fi
# For modern vici mode # For modern vici mode
@ -50,7 +50,7 @@ strongswan_deploy() {
_err "no swanctl config dir is found" _err "no swanctl config dir is found"
return 1 return 1
fi fi
__deploy_cert "$@" "vici" "${_confdir}"
__deploy_cert "vici" "${_confdir}" "$@"
${_swanctl} --load-creds ${_swanctl} --load-creds
fi fi
if [ -z "${_swanctl}" ] && [ -z "${_ipsec}" ]; then if [ -z "${_swanctl}" ] && [ -z "${_ipsec}" ]; then
@ -63,13 +63,13 @@ strongswan_deploy() {
#################### Private functions below ################################## #################### Private functions below ##################################
__deploy_cert() { __deploy_cert() {
_cdomain="${1}"
_ckey="${2}"
_ccert="${3}"
_cca="${4}"
_cfullchain="${5}"
_swan_mode="${6}"
_confdir="${7}"
_swan_mode="${1}"
_confdir="${2}"
_cdomain="${3}"
_ckey="${4}"
_ccert="${5}"
_cca="${6}"
_cfullchain="${7}"
_debug _cdomain "${_cdomain}" _debug _cdomain "${_cdomain}"
_debug _ckey "${_ckey}" _debug _ckey "${_ckey}"
_debug _ccert "${_ccert}" _debug _ccert "${_ccert}"

Loading…
Cancel
Save