Fix.

diff --git a/bookworm/scripts/setup_server.sh b/bookworm/scripts/setup_server.sh
index f8a78b90c888b85957a2ec03a6d07df0231aadbe..09545d1e3503376caa64507ada36ce4a76e7ba7d 100755 (executable)
--- a/bookworm/scripts/setup_server.sh
+++ b/bookworm/scripts/setup_server.sh
@@ -23,7 +23,6 @@ FQDN="$3"
 
 PATH_BORG_HOME=/home/borg
 PATH_CADDYFILE="${PATH_ETC}/caddy/Caddyfile"
-PATH_CADDY_REPO='https://dl.cloudsmith.io/public/caddy/stable'
 PATH_DUMP='/var/www/dump'
 
 prefixed_msg_no_nl 'Determining external IP …'
@@ -48,26 +47,6 @@ if [ ! -z "${FQDN}" ]; then
     fi
 fi
 
-prefixed_msg 'Ensure we have curl and gpg (for caddy installation preparation) …'
-apt_get_digested '-q -q install curl gpg'
-PATH_CURL_ERROR=$(mktemp)
-CMD_RM_CURL_ERROR="rm ${PATH_CURL_ERROR}"
-trapp "${CDM_RM_CURL_ERROR}"
-prefixed_msg 'Retrieve caddy repo key …'
-set +e
-curl -1Lf "${PATH_CADDY_REPO}/gpg.key" 2> "${PATH_CURL_ERROR}" | gpg --dearmor -o /usr/share/keyrings/caddy-stable-archive-keyring.gpg
-RESULT="$?"
-set -e
-if [ "${RESULT}" != '0' ]; then
-    cat "${PATH_CURL_ERROR}"
-    exit 1
-fi
-${CMD_RM_CURL_ERROR}
-trapp
-PATH_APT_CADDY_REPO='/etc/apt/sources.list.d/caddy-stable.list'
-prefixed_msg "Adding caddy repo to ${PATH_APT_CADDY_REPO} …"
-curl -1LfsS "${PATH_CADDY_REPO}/debian.deb.txt" > "${PATH_APT_CADDY_REPO}"
-
 core_setup "${HOSTNAME}" "${FQDN}" "${EXTERNAL_IP}" "${INSTALL_TAGS}"
 
 prefixed_msg 'Moving SSH data from root to user …'