Change that $3 must be used if only wanting to act on a specific domain

This commit is contained in:
Deon George 2021-02-25 13:49:03 +11:00
parent fd95a16d05
commit 2f3c3fe0ac
2 changed files with 4 additions and 5 deletions

View File

@ -12,7 +12,7 @@ before_script:
- docker info - docker info
- docker version - docker version
- echo "$CI_JOB_TOKEN" | docker login -u "$CI_REGISTRY_USER" "$CI_REGISTRY" --password-stdin - echo "$CI_JOB_TOKEN" | docker login -u "$CI_REGISTRY_USER" "$CI_REGISTRY" --password-stdin
- env|sort # env|sort
include: include:
- .gitlab-docker-x86_64.yml - .gitlab-docker-x86_64.yml

7
ssl.sh
View File

@ -12,13 +12,13 @@ elif [ "$1" == "lego" ]; then
[ -r ${CERTFILE} ] || exit 1 [ -r ${CERTFILE} ] || exit 1
cat ${CERTFILE} | while read line; do cat ${CERTFILE} | while read line; do
echo " - line is [${line}]" #echo " - line is [${line}]"
LEGO_ACCOUNT_EMAIL=$(echo ${line} | cut -d':' -f 1) LEGO_ACCOUNT_EMAIL=$(echo ${line} | cut -d':' -f 1)
DOMAINS=$(echo ${line} | cut -d':' -f 2) DOMAINS=$(echo ${line} | cut -d':' -f 2)
LEGO_CERT_DOMAIN=(${DOMAINS//,/ }) LEGO_CERT_DOMAIN=(${DOMAINS//,/ })
if [ -n "$2" ]; then if [ -n "$3" ]; then
if [[ ! " ${DOMAINS[@]} " =~ " ${2} " ]]; then if [[ ! " ${DOMAINS[@]} " =~ " ${3} " ]]; then
continue; continue;
fi fi
fi fi
@ -42,7 +42,6 @@ elif [ "$1" == "lego" ]; then
elif [ ${METHOD} == 'tls' ]; then elif [ ${METHOD} == 'tls' ]; then
LEGO_METHOD="--tls --tls.port :${TLS_PORT}" LEGO_METHOD="--tls --tls.port :${TLS_PORT}"
:
else else
echo "! ERROR: Unknown METHOD [${METHOD}]" && continue echo "! ERROR: Unknown METHOD [${METHOD}]" && continue
fi fi