From 656e59ee0a260de79e1e3d604d32d62f423bacd9 Mon Sep 17 00:00:00 2001
From: Jonathan Dahan <git@jonathan.is>
Date: Sun, 22 Oct 2023 15:45:51 -0400
Subject: [PATCH] cleanup

---
 readme                                | 14 ++++++++++----
 services/caddy.yaml                   | 10 ++++------
 services/caddy/.gitignore             |  3 ---
 services/readme                       |  1 -
 services/web.yaml                     | 20 ++++++++++++++++++++
 services/web/Caddyfile                | 15 ++++++++-------
 services/{caddy => web}/Containerfile |  2 +-
 7 files changed, 43 insertions(+), 22 deletions(-)
 delete mode 100644 services/caddy/.gitignore
 create mode 100644 services/web.yaml
 rename services/{caddy => web}/Containerfile (75%)

diff --git a/readme b/readme
index aa4a757..fd45ba0 100644
--- a/readme
+++ b/readme
@@ -3,15 +3,21 @@
     docker-compose --env-file env.production \
       --file services/caddy.yaml \
       --file services/zitadel.yaml \
-      up
+      up --build
+
+## port forwarding
+
+  echo 'net.ipv4.ip_unprivileged_port_start=80' | sudo tee -a /etc/sysctl.conf
+  sudo sysctl -w net.ipv4.ip_unprivileged_port_start=80
 
 ## beta release
 
-- [*] caddy with landing page of this readme
+- [*] caddy with homepage
 - [*] backup using duplicity uploaded to backblaze b2
+- [ ] webdav for personal home pages
+- [ ] restore using duplicity downloaded from backblaze b2
 - [ ] zitadel sso
-- [ ] bookstack wiki
-- [ ] caddy webdav for personal home pages
+- [ ] wiki
 - [ ] dendrite matrix server
 - [ ] gitea instance
 
diff --git a/services/caddy.yaml b/services/caddy.yaml
index 17f07ff..2380a9f 100644
--- a/services/caddy.yaml
+++ b/services/caddy.yaml
@@ -2,19 +2,17 @@ version: "3.7"
 
 services:
   caddy:
-    build: ./caddy
+    image: caddy
     restart: unless-stopped
     ports:
       - "80:80"
       - "443:443"
       - "443:443/udp"
     volumes:
-      - $PWD/Caddyfile:/etc/caddy/Caddyfile
-      - $PWD/site:/srv
-      - caddy_data:/data
+      - ./caddy/Caddyfile:/etc/caddy/Caddyfile
+      - ../data/caddy/site:/site
+      - ../data/caddy/data:/data
       - caddy_config:/config
 
 volumes:
-  caddy_data:
-    external: true
   caddy_config:
diff --git a/services/caddy/.gitignore b/services/caddy/.gitignore
deleted file mode 100644
index f7dcae4..0000000
--- a/services/caddy/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-caddy
-xcaddy
-.latest_download
diff --git a/services/readme b/services/readme
index da0bd88..bf24395 100644
--- a/services/readme
+++ b/services/readme
@@ -39,4 +39,3 @@ Generally, zitadel has some cli commands that we have put in scripts in the zita
 
 You will want to make a Caddyfile, which will get mounted by the Caddy compose file. 
 
-
diff --git a/services/web.yaml b/services/web.yaml
new file mode 100644
index 0000000..27dec76
--- /dev/null
+++ b/services/web.yaml
@@ -0,0 +1,20 @@
+version: "3.7"
+
+services:
+  caddy:
+    build:
+      context: ./web
+      dockerfile: Containerfile
+    restart: unless-stopped
+    ports:
+      - "80:80"
+      - "443:443"
+      - "443:443/udp"
+    volumes:
+      - ./web/Caddyfile:/etc/caddy/Caddyfile
+      - ../data/web/site:/site
+      - ../data/web/data:/data
+      - caddy_config:/config
+
+volumes:
+  caddy_config:
diff --git a/services/web/Caddyfile b/services/web/Caddyfile
index d81792e..7c6de4e 100644
--- a/services/web/Caddyfile
+++ b/services/web/Caddyfile
@@ -1,11 +1,12 @@
-localhost
+web.localhost
 
-root * ../../data/web
+root * /site
+
+@get method GET
 
 route {
-	rewrite /dav /dav/
-	webdav /dav/* {
-		prefix /dav
-	}
-	file_server
+    basicauth
+    file_server @get browse
+    webdav
 }
+
diff --git a/services/caddy/Containerfile b/services/web/Containerfile
similarity index 75%
rename from services/caddy/Containerfile
rename to services/web/Containerfile
index 9c24075..2311967 100644
--- a/services/caddy/Containerfile
+++ b/services/web/Containerfile
@@ -1,4 +1,4 @@
-FROM caddy:latest-builder AS builder
+FROM caddy:2.7.5-builder-alpine AS builder
 
 RUN xcaddy build \
     --with github.com/mholt/caddy-webdav