diff --git a/inc/certs.inc b/inc/certs.inc index 09d15176..9d594ee3 100755 --- a/inc/certs.inc +++ b/inc/certs.inc @@ -663,34 +663,38 @@ COPYCERTS(){ local COPYCERT=${1} local CERTFOLDER=${2} - arr COPYCERTS - arr CERTFOLDERS - IFS=,; var=(${COPYCERT}); unset IFS - for value in "${var[@]}"; do arr_insert COPYCERTS ${value}; done - IFS=,; var=(${CERTFOLDER}); unset IFS - for value in "${var[@]}"; do arr_insert CERTFOLDERS ${value}; done + if [ ${COPYCERT} ] && [ ${CERTFOLDER} ]; then - i=0 - for CERTSITE in "${COPYCERTS[@]}"; do - c=0; spc=''; until [ $c = $(expr 40 - ${#CERTSITE}) ]; do spc="${spc} "; c=((c+1)); done - echo -en "${idsCL[LightCyan]}Updating ${idsCL[Green]}${CERTSITE} ${idsCL[LightCyan]}...${spc}" - COPYTO=${CERTFOLDERS[${i}]} - NCF=false - scp le@keepalived.scity.us:/etc/letsencrypt/live/${CERTSITE}/privkey.pem ${COPYTO}/privkey.pem >/dev/null 2>&1 - if ! /usr/bin/md5sum -c ${COPYTO}/privkey.pem.md5 >/dev/null 2>&1 || [ "${3^^}" == "FORCE" ]; then - scp le@keepalived.scity.us:/etc/letsencrypt/live/${CERTSITE}/* ${COPYTO}/ - rm -f ${COPYTO}/privkey.pem.md5 - md5sum ${COPYTO}/privkey.pem > ${COPYTO}/privkey.pem.md5 >/dev/null 2>&1 - NCF=true - echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}" - else - echo -e "${idsCL[LightCyan]}No update needed${idsCL[Default]}" - fi - ((i++)) - done - echo - [ ${NCF} = true ] && SERVICE_MGMT nginx reload - echo + arr COPYCERTS + arr CERTFOLDERS + IFS=,; var=(${COPYCERT}); unset IFS + for value in "${var[@]}"; do arr_insert COPYCERTS ${value}; done + IFS=,; var=(${CERTFOLDER}); unset IFS + for value in "${var[@]}"; do arr_insert CERTFOLDERS ${value}; done + + i=0 + for CERTSITE in "${COPYCERTS[@]}"; do + c=0; spc=''; until [ $c = $(expr 40 - ${#CERTSITE}) ]; do spc="${spc} "; c=$(expr ${c} + 1); done + echo -en "${idsCL[LightCyan]}Updating ${idsCL[Green]}${CERTSITE} ${idsCL[LightCyan]}...${spc}" + COPYTO=${CERTFOLDERS[${i}]} + NCF=false + scp le@keepalived.scity.us:/etc/letsencrypt/live/${CERTSITE}/privkey.pem ${COPYTO}/privkey.pem >/dev/null 2>&1 + if ! /usr/bin/md5sum -c ${COPYTO}/privkey.pem.md5 >/dev/null 2>&1 || [ "${3^^}" == "FORCE" ]; then + scp le@keepalived.scity.us:/etc/letsencrypt/live/${CERTSITE}/* ${COPYTO}/ + rm -f ${COPYTO}/privkey.pem.md5 + md5sum ${COPYTO}/privkey.pem > ${COPYTO}/privkey.pem.md5 >/dev/null 2>&1 + NCF=true + echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}" + else + echo -e "${idsCL[LightCyan]}No update needed${idsCL[Default]}" + fi + ((i++)) + done + echo + [ ${NCF} = true ] && SERVICE_MGMT nginx reload + echo + + fi }