From 33c8b1ac4b4504042e2912b5cbe4da7e67545e60 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Wed, 13 Oct 2021 18:27:06 +0000
Subject: [PATCH] Retry acme.sh cloning
Sometimes we observe failures to clone acme.sh from GitHub. Retry it
up to three times with a two-second delay between each try, in hopes
of failing these jobs less often.
While we're here, update the URL to a more current one which doesn't
need redirecting.
Change-Id: I5179c0482afcb407b7d28d4c3ce73d96d41c6493
---
playbooks/roles/letsencrypt-acme-sh-install/README.rst | 2 +-
playbooks/roles/letsencrypt-acme-sh-install/tasks/main.yaml | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/playbooks/roles/letsencrypt-acme-sh-install/README.rst b/playbooks/roles/letsencrypt-acme-sh-install/README.rst
index d14c468fb1..59b1d57dfb 100644
--- a/playbooks/roles/letsencrypt-acme-sh-install/README.rst
+++ b/playbooks/roles/letsencrypt-acme-sh-install/README.rst
@@ -1,6 +1,6 @@
Install acme.sh client
-This makes the `acme.sh <https://github.com/Neilpang/acme.sh>`__
+This makes the `acme.sh <https://github.com/acmesh-official/acme.sh>`__
client available on the host.
Additionally a ``driver.sh`` script is installed to run the
diff --git a/playbooks/roles/letsencrypt-acme-sh-install/tasks/main.yaml b/playbooks/roles/letsencrypt-acme-sh-install/tasks/main.yaml
index 350e7a6cda..b771cd1656 100644
--- a/playbooks/roles/letsencrypt-acme-sh-install/tasks/main.yaml
+++ b/playbooks/roles/letsencrypt-acme-sh-install/tasks/main.yaml
@@ -1,8 +1,12 @@
- name: Install acme.sh client
git:
- repo: https://github.com/Neilpang/acme.sh
+ repo: https://github.com/acmesh-official/acme.sh
dest: /opt/acme.sh
version: dev
+ register: clone_acmesh_result
+ until: clone_acmesh_result is not failed
+ retries: 3
+ delay: 2
- name: Install letsencrypt group
group: