Merge branch 'main' into caddy-docker

caddy/Caddyfile

@@ -3,7 +3,7 @@
 	email certs@tremendousturtle.tools
 	default_sni tremendousturtle.tools
 	acme_ca https://acme-v02.api.letsencrypt.org/directory
-	admin localhost:2019
+	admin :2019
 	# debug
 	# acme_ca https://acme-staging-v02.api.letsencrypt.org/directory
 

cloudflared/docker-compose.yml

@@ -0,0 +1,16 @@
+name: cloudflared
+services:
+  app:
+    image: cloudflare/cloudflared:latest
+    volumes:
+      - ./config:/etc/cloudflared
+    command: tunnel --no-autoupdate run --token eyJhIjoiNjhmNjVkYzZkNDgzODZkMTMwNTk2ODk4ZThjNzVhODMiLCJ0IjoiYmNkMjg3OGYtYTRmYi00OWJmLTk0MGMtMzFkYWE2ZDkyNjIwIiwicyI6Ill6STNNbUUwT0RrdE4yWmhaaTAwWWpZM0xXRTFaRFF0TkdWa09HTmpOVFEwTnpRdyJ9
+    restart: unless-stopped
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+    networks:
+     - proxy-net
+
+networks:
+  proxy-net:
+    external: true