From 5877a395f654da9fccec7cb0f553c889395fbdcd Mon Sep 17 00:00:00 2001 From: sascha Date: Sat, 28 Mar 2026 11:23:32 +0100 Subject: [PATCH] cleanup: wg-easy entfernt, WAHA API-Key als env, .gitignore --- .gitignore | 1 + compose.yaml | 45 +++++++++------------------------------------ 2 files changed, 10 insertions(+), 36 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4c49bd7 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.env diff --git a/compose.yaml b/compose.yaml index 29f18b2..461f5a6 100644 --- a/compose.yaml +++ b/compose.yaml @@ -8,6 +8,10 @@ services: image: caddy container_name: caddy restart: unless-stopped + extra_hosts: + - "host.docker.internal:host-gateway" + environment: + - WAHA_API_KEY=${WAHA_API_KEY} networks: - proxy_network ports: @@ -15,14 +19,13 @@ services: - 443:443/tcp - 443:443/udp - 10.200.200.254:8888:8888 - - 8448:8448 + - 8448:8448 expose: - 2019 volumes: - /app-config/caddy/data:/data - /app-config/caddy/Caddyfile:/etc/caddy/Caddyfile - /app-config/caddy/logs:/var/log/caddy - vaultwarden: image: vaultwarden/server:latest @@ -31,7 +34,7 @@ services: expose: - 80 environment: - DOMAIN: "https://vault.sascha-lutz.de" # Your domain; vaultwarden needs to know it's https to work properly with attachments + DOMAIN: "https://vault.sascha-lutz.de" SIGNUPS_ALLOWED: "false" INVITATIONS_ALLOWED: "false" LOG_FILE: "/var/log/vaultwarden.log" @@ -47,41 +50,11 @@ services: ports: - 10.200.200.254:8000:3000 volumes: - - /app-config/homepage/:/app/config # Make sure your local config directory exists - - /var/run/docker.sock:/var/run/docker.sock # (optional) For docker integrations, see alternative methods + - /app-config/homepage/:/app/config + - /var/run/docker.sock:/var/run/docker.sock environment: - HOMEPAGE_ALLOWED_HOSTS: 10.200.200.254:8000 # required, may need port. See gethomepage.dev/installation/#homepage_allowed_hosts + HOMEPAGE_ALLOWED_HOSTS: 10.200.200.254:8000 PUID: 1000 PGID: 1000 networks: - proxy_network - - wg-easy: - image: ghcr.io/wg-easy/wg-easy:latest - container_name: wg-easy - environment: - - WG_HOST=vpn.sascha-lutz.de - - WG_PORT=51821 - - LANG=DE - - PORT=80 - - PASSWORD_HASH=$$2a$$12$$f5WreKU6S6Al/MybMb77ou5SQh3gslcI8iSHk8HdHEFlXam5Q5iE2 - - volumes: - - /app-config/wg-easy/:/etc/wireguard - - /lib/modules:/lib/modules:ro - networks: - - proxy_network - ports: - - "51821:51821/udp" - - "9999:80" - restart: unless-stopped - cap_add: - - NET_ADMIN - - SYS_MODULE - sysctls: - - net.ipv4.ip_forward=1 - - net.ipv4.conf.all.src_valid_mark=1 - - net.ipv6.conf.all.disable_ipv6=0 - - net.ipv6.conf.all.forwarding=1 - - net.ipv6.conf.default.forwarding=1 -