From f57def9fdce7c6b9a11ffec08ed0195efae84f6b Mon Sep 17 00:00:00 2001 From: lostinlight Date: Fri, 9 Nov 2018 20:56:17 +0300 Subject: [PATCH] Auto generate cert without cleanup --- .gitlab-ci.yml | 3 +-- letsencrypt_generate.sh | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4268e8b..de2e660 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ -image: node:8.12 +image: node:10.13.0 pages: script: @@ -34,5 +34,4 @@ cert-renewal: - git config --global user.email $GITLAB_USER_EMAIL - chmod +x ./letsencrypt_generate.sh - chmod +x ./letsencrypt_authenticator.sh - - chmod +x ./letsencrypt_cleanup.sh - ./letsencrypt_generate.sh diff --git a/letsencrypt_generate.sh b/letsencrypt_generate.sh index ed0051e..265bf29 100644 --- a/letsencrypt_generate.sh +++ b/letsencrypt_generate.sh @@ -10,7 +10,7 @@ days_diff=$((($end_epoch - $current_epoch) / 60 / 60 / 24)) if [ $days_diff -lt $renew_days_threshold ]; then ls echo "Certificate is $days_diff days old, renewing now." - certbot certonly --manual --debug --preferred-challenges=http -m $GITLAB_USER_EMAIL --agree-tos --manual-auth-hook letsencrypt_authenticator.sh --manual-cleanup-hook letsencrypt_cleanup.sh --manual-public-ip-logging-ok -d fediverse.party + certbot certonly --manual --debug --preferred-challenges=http -m $GITLAB_USER_EMAIL --agree-tos --manual-auth-hook letsencrypt_authenticator.sh --manual-public-ip-logging-ok -d fediverse.party echo "Certbot finished. Updating GitLab Pages domains." curl --request PUT --header "PRIVATE-TOKEN: $CERTBOT_RENEWAL_GIT_TOKEN" --form "certificate=@/etc/letsencrypt/live/fediverse.party/fullchain.pem" --form "key=@/etc/letsencrypt/live/fediverse.party/privkey.pem" https://gitlab.com/api/v4/projects/$CI_PROJECT_ID/pages/domains/fediverse.party else