Fix.

diff --git a/bookworm/etc/caddy/caddy/Caddyfile b/bookworm/etc/caddy/caddy/Caddyfile
index 58691041e44bb3a43d19ff55b34d0fe3f4ce20be..788e8f745f8e224accbb243566cf3fe91f3f94e2 100644 (file)
--- a/bookworm/etc/caddy/caddy/Caddyfile
+++ b/bookworm/etc/caddy/caddy/Caddyfile
@@ -1,4 +1,7 @@
 REPLACE_WITH_FQDN {
 REPLACE_WITH_FQDN {

-    root * /var/www/html
+    root * /var/www/dump
+    basic_auth /private/* {
+        user REPLACE_WITH_HASH
+    }

     file_server browse
 }
     file_server browse
 }

diff --git a/bookworm/scripts/setup_catgirl.sh b/bookworm/scripts/setup_catgirl.sh
index 0951fc827ab81ef4f05f351240c3cfc8fef95964..ee7db2c5cfb8f86662a1156bd17241f3e6e3baf3 100755 (executable)
--- 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'
 
 
 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"
 HOSTNAME="$1"
 FQDN="$2"
 SASL_PASSWORD="$3"

+CADDY_PASSWORD="$4"

 
 PATH_REL_ETC=etc
 PATH_CONF_ETC="${PATH_CONF}/${PATH_REL_ETC}"
 
 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.
 # 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"
 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
 systemctl reload caddy