diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bcef8e6..0aa411c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,7 @@ before_script: - docker info - docker version - echo "$CI_JOB_TOKEN" | docker login -u "$CI_REGISTRY_USER" "$CI_REGISTRY" --password-stdin -- env|sort +# env|sort include: - .gitlab-docker-x86_64.yml diff --git a/ssl.sh b/ssl.sh index 62713fc..b8d03b7 100755 --- a/ssl.sh +++ b/ssl.sh @@ -12,13 +12,13 @@ elif [ "$1" == "lego" ]; then [ -r ${CERTFILE} ] || exit 1 cat ${CERTFILE} | while read line; do - echo " - line is [${line}]" + #echo " - line is [${line}]" LEGO_ACCOUNT_EMAIL=$(echo ${line} | cut -d':' -f 1) DOMAINS=$(echo ${line} | cut -d':' -f 2) LEGO_CERT_DOMAIN=(${DOMAINS//,/ }) - if [ -n "$2" ]; then - if [[ ! " ${DOMAINS[@]} " =~ " ${2} " ]]; then + if [ -n "$3" ]; then + if [[ ! " ${DOMAINS[@]} " =~ " ${3} " ]]; then continue; fi fi @@ -42,7 +42,6 @@ elif [ "$1" == "lego" ]; then elif [ ${METHOD} == 'tls' ]; then LEGO_METHOD="--tls --tls.port :${TLS_PORT}" - : else echo "! ERROR: Unknown METHOD [${METHOD}]" && continue fi