proxy/Caddyfile

@@ -4,7 +4,6 @@
 		output stdout
 		format console
 	}
-	auto_https disable_redirects
 }
 
 (proxy-auth) {
@@ -16,14 +15,6 @@
 	}
 }
 
-http://*.{$DOMAIN} {
-	redir https://{labels.3}.{$DOMAIN}{uri} permanent
-}
-
-http://*.{$OLD_DOMAIN} {
-	redir https://{labels.1}.{$DOMAIN}{uri} permanent
-}
-
 *.{$DOMAIN} {
 	tls {
 		dns netcup {
@@ -52,7 +43,8 @@ http://*.{$OLD_DOMAIN} {
 
 	@hassi host hassi.{$DOMAIN}
 	handle @hassi {
-		reverse_proxy homeassistant:8123
+		# reverse_proxy homeassistant:8123
+		reverse_proxy {host}:8123
 	}
 
 	@zigbee2mqtt host zigbee2mqtt.{$DOMAIN}
@@ -83,10 +75,7 @@ http://*.{$OLD_DOMAIN} {
 
 	@uptime host uptime.{$DOMAIN}
 	handle @uptime {
-		route {
+		reverse_proxy uptime-kuma:3001
-			import proxy-auth
-			reverse_proxy uptime-kuma:3001
-		}
 	}
 
 	@torrent host torrent.{$DOMAIN}

proxy/docker-compose.yaml

@@ -16,7 +16,6 @@ services:
       - web
     environment:
       - DOMAIN=${DOMAIN}
-      - OLD_DOMAIN=${OLD_DOMAIN}
       - LOCAL_CA_NAME=${LOCAL_CA_NAME}
       - NETCUP_CUSTOMER_NUMBER=${NETCUP_CUSTOMER_NUMBER}
       - NETCUP_API_KEY=${NETCUP_API_KEY}

smartHome/docker-compose.yaml

@@ -8,13 +8,11 @@ services:
     environment:
       - TZ=Europe/Berlin
     restart: unless-stopped
-    #network_mode: host
+    network_mode: host
-    networks:
-       - web
-       - smarthome
     labels:
       - "docker.group=smartHome"
 
+
   mqttbroker:
     image: eclipse-mosquitto:${MOSQUITTO_VERSION}
     restart: unless-stopped
@@ -30,6 +28,7 @@ services:
     labels:
       - "docker.group=smartHome"
 
+
   zigbee2mqtt:
     restart: unless-stopped
     image: koenkk/zigbee2mqtt
@@ -46,26 +45,6 @@ services:
     labels:
       - "docker.group=smartHome"
 
-  db:
-    image: postgres:${POSTGRES_VERSION}
-    restart: unless-stopped
-    networks:
-      - smarthome
-    volumes:
-      - ${VOLUMES_PATH}/smartHome/postgres:/var/lib/postgresql/data
-    environment:
-      - POSTGRES_DB=${POSTGRES_DB}
-      - POSTGRES_USER=${POSTGRES_USER}
-      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}"]
-      start_period: 20s
-      interval: 30s
-      retries: 5
-      timeout: 5s
-    labels:
-      - "docker.group=smartHome"
-
 
 networks:
   web: