cleanup

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
 

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:

services/caddy/.gitignore

@@ -1,3 +0,0 @@
-caddy
-xcaddy
-.latest_download

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. 
 
-

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:

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
 }
+

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