From 2d3f5864feabe0163dd76051ccc22778602812e3 Mon Sep 17 00:00:00 2001
From: Christian Heller <c.heller@plomlompom.de>
Date: Mon, 14 Apr 2025 09:10:40 +0200
Subject: [PATCH] Fix.
---
bookworm/etc/caddy/caddy/Caddyfile | 5 ++++-
bookworm/scripts/setup_catgirl.sh | 7 +++++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/bookworm/etc/caddy/caddy/Caddyfile b/bookworm/etc/caddy/caddy/Caddyfile
index 5869104..788e8f7 100644
--- a/bookworm/etc/caddy/caddy/Caddyfile
+++ b/bookworm/etc/caddy/caddy/Caddyfile
@@ -1,4 +1,7 @@
REPLACE_WITH_FQDN {
- root * /var/www/html
+ root * /var/www/dump
+ basic_auth /private/* {
+ user REPLACE_WITH_HASH
+ }
file_server browse
}
diff --git a/bookworm/scripts/setup_catgirl.sh b/bookworm/scripts/setup_catgirl.sh
index 0951fc8..ee7db2c 100755
--- a/bookworm/scripts/setup_catgirl.sh
+++ b/bookworm/scripts/setup_catgirl.sh
@@ -12,10 +12,11 @@ cd $(dirname "$0")
MIN_TAGS='all server catgirl caddy'
-expect_n_args 3 3 'HOSTNAME, FQDN, SASL_PASSWORD' $@
+expect_n_args 4 4 'HOSTNAME, FQDN, SASL_PASSWORD, CADDY_PASSWORD' $@
HOSTNAME="$1"
FQDN="$2"
SASL_PASSWORD="$3"
+CADDY_PASSWORD="$4"
PATH_REL_ETC=etc
PATH_CONF_ETC="${PATH_CONF}/${PATH_REL_ETC}"
@@ -65,6 +66,8 @@ systemctl start nftables.service
# systemctl start catgirl.service
# Reload caddy with new config.
+HASH=$(caddy hash-password --plaintext "${CADDY_PASSWORD}")
+sed -i "s/REPLACE_WITH_HASH/${HASH}/g" "${PATH_ETC}/caddy/Caddyfile"
sed -i "s/REPLACE_WITH_FQDN/${FQDN}/g" "${PATH_ETC}/caddy/Caddyfile"
-mkdir -p /var/www/html
+mkdir -p /var/www/dump/{private,public}
systemctl reload caddy
--
2.30.2