From 9ed0ebcfbdb995ab0ede8a9d016151e8a95d5e67 Mon Sep 17 00:00:00 2001 From: Han Wang Date: Tue, 23 Nov 2021 14:23:07 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=80=82=E9=85=8D=E6=96=B0=E7=9A=84SSL?= =?UTF-8?q?=E6=8F=90=E4=BE=9B=E5=95=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cert-up.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cert-up.sh b/cert-up.sh index 00cbf64..314a0fa 100644 --- a/cert-up.sh +++ b/cert-up.sh @@ -29,9 +29,10 @@ installAcme () { mkdir -p ${TEMP_PATH} cd ${TEMP_PATH} echo 'begin downloading acme.sh tool...' - ACME_SH_ADDRESS=`curl -L https://cdn.jsdelivr.net/gh/andyzhshg/syno-acme@master/acme.sh.address` + VERSION=wget -qO- -t1 -T2 "https://api.github.com/repos/acmesh-official/acme.sh/releases/latest" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g' SRC_TAR_NAME=acme.sh.tar.gz - curl -L -o ${SRC_TAR_NAME} ${ACME_SH_ADDRESS} + ZEROSSL_EMAI=wanghan0501@foxmail.com + curl -L -o ${SRC_TAR_NAME} https://ghproxy.com/https://github.com/acmesh-official/acme.sh/archive/${VERSION}.tar.gz acme.sh --register-account -m ${ZEROSSL_EMAI} --server zerossl SRC_NAME=`tar -tzf ${SRC_TAR_NAME} | head -1 | cut -f1 -d"/"` tar zxvf ${SRC_TAR_NAME} echo 'begin installing acme.sh tool...' From 61be172b2f279eda0fb18f1733db9bd90dbc9f14 Mon Sep 17 00:00:00 2001 From: Han Wang Date: Fri, 26 Nov 2021 10:15:47 +0800 Subject: [PATCH 2/3] Update cert-up.sh fix error --- cert-up.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cert-up.sh b/cert-up.sh index 314a0fa..e1f87bc 100644 --- a/cert-up.sh +++ b/cert-up.sh @@ -29,10 +29,10 @@ installAcme () { mkdir -p ${TEMP_PATH} cd ${TEMP_PATH} echo 'begin downloading acme.sh tool...' - VERSION=wget -qO- -t1 -T2 "https://api.github.com/repos/acmesh-official/acme.sh/releases/latest" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g' + version=wget -qO- -t1 -T2 "https://api.github.com/repos/acmesh-official/acme.sh/releases/latest" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g' + ACME_SH_ADDRESS=https://ghproxy.com/https://github.com/acmesh-official/acme.sh/archive/${version}.tar.gz SRC_TAR_NAME=acme.sh.tar.gz - ZEROSSL_EMAI=wanghan0501@foxmail.com - curl -L -o ${SRC_TAR_NAME} https://ghproxy.com/https://github.com/acmesh-official/acme.sh/archive/${VERSION}.tar.gz acme.sh --register-account -m ${ZEROSSL_EMAI} --server zerossl + curl -L -o ${SRC_TAR_NAME} ${ACME_SH_ADDRESS} SRC_NAME=`tar -tzf ${SRC_TAR_NAME} | head -1 | cut -f1 -d"/"` tar zxvf ${SRC_TAR_NAME} echo 'begin installing acme.sh tool...' @@ -49,7 +49,7 @@ generateCrt () { source config echo 'begin updating default cert by acme.sh tool' source ${ACME_BIN_PATH}/acme.sh.env - ${ACME_BIN_PATH}/acme.sh --force --log --issue --dns ${DNS} --dnssleep ${DNS_SLEEP} -d "${DOMAIN}" -d "*.${DOMAIN}" + ${ACME_BIN_PATH}/acme.sh --force --log --issue --server letsencrypt --dns ${DNS} --dnssleep ${DNS_SLEEP} -d "${DOMAIN}" -d "*.${DOMAIN}" ${ACME_BIN_PATH}/acme.sh --force --installcert -d ${DOMAIN} -d *.${DOMAIN} \ --certpath ${CRT_PATH}/cert.pem \ --key-file ${CRT_PATH}/privkey.pem \ From fa1c56e89f73e0591107a416a7f61a8274097fda Mon Sep 17 00:00:00 2001 From: Han Wang Date: Fri, 26 Nov 2021 10:24:41 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=9C=80=E6=96=B0=E7=89=88=E6=9C=ACacm.sh?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cert-up.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cert-up.sh b/cert-up.sh index e1f87bc..b9bebc0 100644 --- a/cert-up.sh +++ b/cert-up.sh @@ -29,8 +29,8 @@ installAcme () { mkdir -p ${TEMP_PATH} cd ${TEMP_PATH} echo 'begin downloading acme.sh tool...' - version=wget -qO- -t1 -T2 "https://api.github.com/repos/acmesh-official/acme.sh/releases/latest" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g' - ACME_SH_ADDRESS=https://ghproxy.com/https://github.com/acmesh-official/acme.sh/archive/${version}.tar.gz + ACME_SH_VERSION=$(wget -qO- -t1 -T2 "https://api.github.com/repos/acmesh-official/acme.sh/releases/latest" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g') + ACME_SH_ADDRESS=https://ghproxy.com/https://github.com/acmesh-official/acme.sh/archive/${ACME_SH_VERSION}.tar.gz SRC_TAR_NAME=acme.sh.tar.gz curl -L -o ${SRC_TAR_NAME} ${ACME_SH_ADDRESS} SRC_NAME=`tar -tzf ${SRC_TAR_NAME} | head -1 | cut -f1 -d"/"`