auth/docker-compose.yml

@@ -1,90 +0,0 @@
-services:
-
-  authentik-server:
-    image: ghcr.io/goauthentik/server:${AUTHENTIK_VERSION}
-    restart: unless-stopped
-    command: server
-    environment:
-      - AUTHENTIK_REDIS__HOST=redis
-      - AUTHENTIK_POSTGRESQL__HOST=postgresql
-      - AUTHENTIK_POSTGRESQL__USER=${POSTGRES_USER}
-      - AUTHENTIK_POSTGRESQL__NAME=${POSTGRES_DB}
-      - AUTHENTIK_POSTGRESQL__PASSWORD=${POSTGRES_PASSWORD}
-      - AUTHENTIK_SECRET_KEY=${AUTHENTIK_SECRET_KEY}
-      - AUTHENTIK_ERROR_REPORTING__ENABLED=${AUTHENTIK_ERROR_REPORTING__ENABLED}
-    volumes:
-      - ${VOLUMES_PATH}/auth/media:/media
-      - ${VOLUMES_PATH}/auth/custom-templates:/templates
-    depends_on:
-      postgresql:
-        condition: service_healthy
-      redis:
-        condition: service_healthy
-    networks:
-      - web
-      - auth
-
-  authentik-worker:
-    image: ghcr.io/goauthentik/server:${AUTHENTIK_VERSION}
-    restart: unless-stopped
-    command: worker
-    environment:
-      - AUTHENTIK_REDIS__HOST=redis
-      - AUTHENTIK_POSTGRESQL__HOST=postgresql
-      - AUTHENTIK_POSTGRESQL__USER=${POSTGRES_USER}
-      - AUTHENTIK_POSTGRESQL__NAME=${POSTGRES_DB}
-      - AUTHENTIK_POSTGRESQL__PASSWORD=${POSTGRES_PASSWORD}
-      - AUTHENTIK_SECRET_KEY=${AUTHENTIK_SECRET_KEY}
-      - AUTHENTIK_ERROR_REPORTING__ENABLED=${AUTHENTIK_ERROR_REPORTING__ENABLED}
-    user: root
-    volumes:
-      # - /var/run/docker.sock:/var/run/docker.sock
-      - ${VOLUMES_PATH}/auth/media:/media
-      - ${VOLUMES_PATH}/auth/certs:/certs
-      - ${VOLUMES_PATH}/auth/custom-templates:/templates
-    depends_on:
-      postgresql:
-        condition: service_healthy
-      redis:
-        condition: service_healthy
-    networks:
-      - auth
-
-  postgresql:
-    image: postgres:${POSTGRES_VERSION}
-    restart: unless-stopped
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}"]
-      start_period: 20s
-      interval: 30s
-      retries: 5
-      timeout: 5s
-    volumes:
-      - ${VOLUMES_PATH}/auth/postgres/:/var/lib/postgresql/data
-    environment:
-      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
-      - POSTGRES_USER=${POSTGRES_USER}
-      - POSTGRES_DB=${POSTGRES_DB}
-    networks:
-      - auth
-
-  redis:
-    image: redis:${REDIS_VERSION}
-    command: --save 60 1 --loglevel warning
-    restart: unless-stopped
-    healthcheck:
-      test: ["CMD-SHELL", "redis-cli ping | grep PONG"]
-      start_period: 20s
-      interval: 30s
-      retries: 5
-      timeout: 3s
-    volumes:
-      - ${VOLUMES_PATH}/auth/redis:/data
-    networks:
-      - auth
-
-
-networks:
-  auth:
-  web:
-    external: true

paperless/docker-compose.yaml

@@ -60,9 +60,6 @@ services:
       - USERMAP_GID=1000
       - PAPERLESS_PRE_CONSUME_SCRIPT=/usr/src/paperless/scripts/removePdfPassword.py
       - PAPERLESS_OCR_USER_ARGS=${USER_ARGS_JSON}
-      - PAPERLESS_APPS=allauth.socialaccount.providers.openid_connect
-      - PAPERLESS_SOCIALACCOUNT_PROVIDERS=${PAPERLESS_SOCIALACCOUNT_PROVIDERS}
-      - PAPERLESS_CSRF_TRUSTED_ORIGINS=https://paperless.home.florianzirker.de,https://auth.home.florianzirker.de
     labels:
       - "docker.group=paperless"
 

proxy/Caddyfile

@@ -4,24 +4,7 @@
 		output stdout
 		format console
 	}
-	auto_https disable_redirects
+	debug
-}
-
-(proxy-auth) {
-	reverse_proxy /outpost.goauthentik.io/* http://authentik-server:9000
-	forward_auth http://authentik-server:9000 {
-		uri /outpost.goauthentik.io/auth/caddy
-		copy_headers X-Authentik-Username X-Authentik-Groups X-Authentik-Entitlements X-Authentik-Email X-Authentik-Name X-Authentik-Uid X-Authentik-Jwt X-Authentik-Meta-Jwks X-Authentik-Meta-Outpost X-Authentik-Meta-Provider X-Authentik-Meta-App X-Authentik-Meta-Version
-		trusted_proxies private_ranges
-	}
-}
-
-http://*.{$DOMAIN} {
-	redir https://{labels.3}.{$DOMAIN}{uri} permanent
-}
-
-http://*.{$OLD_DOMAIN} {
-	redir https://{labels.1}.{$DOMAIN}{uri} permanent
 }
 
 *.{$DOMAIN} {
@@ -39,11 +22,8 @@ http://*.{$OLD_DOMAIN} {
 
 	@whoami host whoami.{$DOMAIN}
 	handle @whoami {
-		route {
-			import proxy-auth
 		reverse_proxy whoami:80
 	}
-	}
 
 	@dashboard host dashboard.{$DOMAIN}
 	handle @dashboard {
@@ -52,16 +32,14 @@ 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}
 	handle @zigbee2mqtt {
-		route {
-			import proxy-auth
 		reverse_proxy zigbee2mqtt:8080
 	}
-	}
 
 	@jellyfin host jellyfin.{$DOMAIN}
 	handle @jellyfin {
@@ -75,32 +53,18 @@ http://*.{$OLD_DOMAIN} {
 
 	@download host download.{$DOMAIN}
 	handle @download {
-		route {
-			import proxy-auth
 		reverse_proxy pyload:8000
 	}
-	}
 
 	@uptime host uptime.{$DOMAIN}
 	handle @uptime {
-		route {
-			import proxy-auth
 		reverse_proxy uptime-kuma:3001
 	}
-	}
 
 	@torrent host torrent.{$DOMAIN}
 	handle @torrent {
-		route {
-			import proxy-auth
 		reverse_proxy transmission:9091
 	}
-	}
-
-	@auth host auth.{$DOMAIN}
-	handle @auth {
-		reverse_proxy authentik-server:9000
-	}
 
 	# Fallback unhandled (sub)domains
 	handle {

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}
@@ -38,4 +37,6 @@ services:
 networks:
   web:
     external: true
+  dockersocket:
+    external: true
 

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:

start-all.sh

@@ -6,7 +6,6 @@ function up {
 }
 
 up proxy;
-up auth;
 up monitoring;
 up smartHome;
 up dashboard;

torrent/docker-compose.yaml

@@ -4,6 +4,8 @@ services:
     image: lscr.io/linuxserver/transmission:${TRANSMISSION_VERSION}
     environment:
       - TZ=Etc/UTC
+      - USER=${USERNAME}
+      - PASS=${PASSWORD}
     volumes:
       - ${VOLUMES_PATH}/torrent/transmission:/config
       - ${DOWNLOAD_PATH}:/downloads