From e4656171e1d5ea925015d0579de5861d93998d82 Mon Sep 17 00:00:00 2001
From: Rik Veenboer <rik.veenboer@gmail.com>
Date: Thu, 14 Nov 2024 14:25:39 +0100
Subject: [PATCH] move some services from nginx to caddy

---
 caddy/Caddyfile                    |  6 ++-
 nginx/etc/nginx/conf.d/global.conf | 59 ------------------------------
 2 files changed, 5 insertions(+), 60 deletions(-)

diff --git a/caddy/Caddyfile b/caddy/Caddyfile
index 63e228b..eb19af2 100644
--- a/caddy/Caddyfile
+++ b/caddy/Caddyfile
@@ -34,4 +34,8 @@ authentik.rik.veenboer.xyz {
 }
 
 import proxy app host:12345
-import proxy daggos host:3000
+import proxy dagster host:3000
+import proxy photoprism host:2342
+import proxy qbittorrent host:9092
+import proxy esp host:6052
+import proxy dsmr host:8888
diff --git a/nginx/etc/nginx/conf.d/global.conf b/nginx/etc/nginx/conf.d/global.conf
index fc3c8fa..7773f25 100644
--- a/nginx/etc/nginx/conf.d/global.conf
+++ b/nginx/etc/nginx/conf.d/global.conf
@@ -53,18 +53,6 @@ server {
     }
 }
 
-server {
-    # dsmr
-    listen 80;
-
-    server_name dsmr.rik.veenboer.xyz;
-    location / {
-        proxy_pass http://host:8888;
-        rewrite ^/dsmr(.*)$ $1 break;
-        include /etc/nginx/conf/proxy.conf;
-    }
-}
-
 server {
     # homeassistant
     listen 80;
@@ -88,17 +76,6 @@ server {
     }
 }
 
-server {
-    # esphome
-    listen 80;
-
-    server_name esp.rik.veenboer.xyz;
-    location / {
-        proxy_pass http://host:6052;
-        include /etc/nginx/conf/proxy.conf;
-    }
-}
-
 server {
     # homarr
     listen 80;
@@ -183,26 +160,6 @@ server {
     }
 }
 
-server {
-    # qbittorrent
-    listen 80;
-    server_name qbittorrent.rik.veenboer.xyz;
-    location / {
-        proxy_pass http://host:9092;
-        include /etc/nginx/conf/proxy.conf;
-    }
-}
-
-server {
-    # photoprism
-    listen 80;
-    server_name photoprism.rik.veenboer.xyz;
-    location / {
-        proxy_pass http://host:2342;
-        include /etc/nginx/conf/proxy.conf;
-    }
-}
-
 server {
     # pgadmin
     listen 80;
@@ -213,22 +170,6 @@ server {
     }
 }
 
-server {
-    # dagster
-    listen 80;
-    server_name dagster.rik.veenboer.xyz;
-    location / {
-        proxy_pass http://host:3000;
-        include /etc/nginx/conf/proxy.conf;
-
-        # auth_basic           "Private";
-        # auth_basic_user_file /host/etc/.htpasswd;
-
-        include /etc/nginx/conf/headers.conf;
-    }
-    include /etc/nginx/conf/vouch.conf;
-}
-
 server {
     # test
     listen 80;