From 7e9f295f0a85dd96ef40c5045e464b3e9b9e2a01 Mon Sep 17 00:00:00 2001
From: Christian Heller <c.heller@plomlompom.de>
Date: Mon, 14 Apr 2025 06:54:13 +0200
Subject: [PATCH] Fix.

---
 bookworm/aptmark/caddy            |  2 ++
 bookworm/scripts/setup_catgirl.sh | 22 ++++++++++++----------
 2 files changed, 14 insertions(+), 10 deletions(-)
 create mode 100644 bookworm/aptmark/caddy

diff --git a/bookworm/aptmark/caddy b/bookworm/aptmark/caddy
new file mode 100644
index 0000000..aeb9382
--- /dev/null
+++ b/bookworm/aptmark/caddy
@@ -0,0 +1,2 @@
+caddy
+#
diff --git a/bookworm/scripts/setup_catgirl.sh b/bookworm/scripts/setup_catgirl.sh
index b211788..7ef9332 100755
--- a/bookworm/scripts/setup_catgirl.sh
+++ b/bookworm/scripts/setup_catgirl.sh
@@ -23,6 +23,11 @@ PATH_ETC="/${PATH_REL_ETC}"
 PATH_HOSTS="${PATH_ETC}/hosts"
 PATH_BORG_HOME=/home/borg
 
+echo '\nPreparing caddy install.'
+apt -y install curl
+curl -1Lf 'https://dl.cloudsmith.io/public/caddy/stable/gpg.key' | gpg --dearmor -o /usr/share/keyrings/caddy-stable-archive-keyring.gpg
+curl -1Lf 'https://dl.cloudsmith.io/public/caddy/stable/debian.deb.txt' | tee /etc/apt/sources.list.d/caddy-stable.list
+
 init_packages "${MIN_TAGS}"
 
 echo '\nSetting hostname and FQDN.'
@@ -54,14 +59,11 @@ echo '\nEnabling the firewall.'
 systemctl enable nftables.service
 systemctl start nftables.service
 
-echo '\nSetting up catgirl.'
-sed -i "s/REPLACE_WITH_SASL_PASSWORD/${SASL_PASSWORD}/g" "${PATH_USER_HOME}/.config/catgirl/libera"
-systemctl enable catgirl.service
-systemctl start catgirl.service
+# echo '\nSetting up catgirl.'
+# sed -i "s/REPLACE_WITH_SASL_PASSWORD/${SASL_PASSWORD}/g" "${PATH_USER_HOME}/.config/catgirl/libera"
+# systemctl enable catgirl.service
+# systemctl start catgirl.service
 
-echo '\nSetting up caddy.'
-apt install -y debian-keyring debian-archive-keyring apt-transport-https curl
-curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/gpg.key' | gpg --dearmor -o /usr/share/keyrings/caddy-stable-archive-keyring.gpg
-curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/debian.deb.txt' | tee /etc/apt/sources.list.d/caddy-stable.list
-apt update
-apt install caddy
+# Reload caddy config.
+caddy stop
+caddy start
-- 
2.30.2