From 5458836c03132b9b9e1b4c0c1c030619a29c0e26 Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Mon, 16 Jun 2025 18:20:47 +0200 Subject: [PATCH] security/acme-client: avoid startup error, refs #4743 --- security/acme-client/pkg-descr | 1 + .../src/opnsense/scripts/OPNsense/AcmeClient/setup.sh | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/security/acme-client/pkg-descr b/security/acme-client/pkg-descr index ff4b768bb..4c69017f3 100644 --- a/security/acme-client/pkg-descr +++ b/security/acme-client/pkg-descr @@ -15,6 +15,7 @@ Added: Fixed: * acme.sh is always called with "--days 1" (#4711) +* avoid startup error: "rmdir... Not a directory" (#4743) 4.9 diff --git a/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/setup.sh b/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/setup.sh index 8a6352652..567364b40 100755 --- a/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/setup.sh +++ b/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/setup.sh @@ -20,7 +20,10 @@ chmod 750 ${ACME_BASE} ${ACME_BASE}/* # This should guard against manual misconfiguration. for link in ${ACME_LINKS}; do # First remove any existing file/directory. - if [ -f "${ACME_BASE}/home/${link}" ]; then + if [ -L "${ACME_BASE}/home/${link}" ]; then + # Already a symlink, skip this enty. + continue + elif [ -f "${ACME_BASE}/home/${link}" ]; then rm ${ACME_BASE}/home/${link} elif [ -d "${ACME_BASE}/home/${link}" ]; then rmdir ${ACME_BASE}/home/${link}