From d02573112eb03fd725de2a3306e0698aeb8f747d Mon Sep 17 00:00:00 2001
From: Tord-Vincent Heggland <tordvh@hotmail.no>
Date: Sun, 10 May 2026 13:53:56 +0200
Subject: [PATCH] license

---
 LICENSE                  | 21 +++++++++++++++++++++
 caddy/Caddyfile          |  9 ++++++++-
 caddy/sites/whoami.caddy | 26 ++++++++++++++++++++++++++
 docker-compose.yaml      | 11 +++--------
 4 files changed, 58 insertions(+), 9 deletions(-)
 create mode 100644 LICENSE
 create mode 100644 caddy/sites/whoami.caddy

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..00e6fa8
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 Tord-Vincent Heggland
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/caddy/Caddyfile b/caddy/Caddyfile
index f6026ab..23b7e30 100644
--- a/caddy/Caddyfile
+++ b/caddy/Caddyfile
@@ -1,3 +1,4 @@
+
 {
 	email {$ACME_EMAIL}
 }
@@ -28,9 +29,11 @@ import snippets/*.caddy
 git.{$DOMENESHOP_DNS} {
 	import remote-ip
 	handle @external {
+		redir / /tvh-linux
 		import rate-limit
 		reverse_proxy gitea:3000
 	}
+	respond "Forbidden" 403
 }
 lms.home.{$DOMENESHOP_DNS}  {
 	import dns-tls
@@ -46,7 +49,10 @@ pihole.home.{$DOMENESHOP_DNS} {
 	import remote-ip
 	handle @internal {
 		redir / /admin
-		reverse_proxy pihole:80
+		reverse_proxy 10.10.10.1:18080
+	}
+	handle {
+		respond "Forbidden" 403
 	}
 }
 nextcloud.{$DOMENESHOP_DNS}  {
@@ -56,6 +62,7 @@ nextcloud.{$DOMENESHOP_DNS}  {
 		encode gzip zstd
 		reverse_proxy nextcloud-app:80
 	}
+	respond "Forbidden" 403
 }
 portainer.{$DOMENESHOP_DNS} {
 	import remote-ip
diff --git a/caddy/sites/whoami.caddy b/caddy/sites/whoami.caddy
new file mode 100644
index 0000000..50bbf69
--- /dev/null
+++ b/caddy/sites/whoami.caddy
@@ -0,0 +1,26 @@
+whoami.srv.{$DOMENESHOP_DNS}  {
+	respond <<EOF
+remote_host: {remote_host}
+
+remote_ip: {remote_ip}
+
+client_ip: {client_ip}
+
+host: {host}
+
+x_forwarded_for: {header.X-Forwarded-For}
+
+x_real_ip: {header.X-Real-IP}
+
+proto: {scheme}
+EOF 200
+}
+whoami.home.{$DOMENESHOP_DNS} {
+	import dns-tls
+	respond <<EOF
+remote_host: {remote_host}
+remote_ip: {remote_ip}
+client_ip: {client_ip}
+host: {host}
+EOF 200
+}
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 106fdc1..ac2d2fc 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -13,19 +13,14 @@ services:
       - caddy_data:/data
       - caddy_config:/config
     networks:
-      - proxy_net
-      - edge_net
-      - proxy_swarm
-      - dns_internal
+      proxy_net:
+        ipv4_address: 172.19.0.254
+      proxy_swarm:
 networks:
   proxy_net:
     external: true
-  edge_net:
-    external: true
   proxy_swarm:
     external: true
-  dns_internal:
-    external: true
 volumes:
   caddy_data:
   caddy_config: