From 7ded14f95f328abe03d989e925901e9ea0faf330 Mon Sep 17 00:00:00 2001 From: venus Date: Thu, 2 Apr 2026 14:25:22 -0500 Subject: [PATCH] testing --- compose.yml | 2 +- traefik.yml | 2 ++ wg-easy/compose.yml | 40 ---------------------------------------- whoami.yml | 14 +++++++++++++- 4 files changed, 16 insertions(+), 42 deletions(-) delete mode 100644 wg-easy/compose.yml diff --git a/compose.yml b/compose.yml index c914ba0..ac47535 100644 --- a/compose.yml +++ b/compose.yml @@ -10,7 +10,7 @@ services: - "80:80" - "443:443" volumes: - - "/var/run/docker.sock:/var/run/docker.sock" + - "/var/run/docker.sock:/var/run/docker.sock" # running as root TODO need to make new user - "./letsencrypt:/letsencrypt" - "./traefik.yml:/etc/traefik/traefik.yml:ro" # sets the traefik.yml file as the options file for configuring proxy settings networks: diff --git a/traefik.yml b/traefik.yml index a8bf791..7796534 100644 --- a/traefik.yml +++ b/traefik.yml @@ -23,6 +23,8 @@ entryPoints: scheme: https websecure: address: ":443" + # defenk-only: + # address: ":80" certificatesResolvers: basic: diff --git a/wg-easy/compose.yml b/wg-easy/compose.yml deleted file mode 100644 index c959372..0000000 --- a/wg-easy/compose.yml +++ /dev/null @@ -1,40 +0,0 @@ -services: - wg-easy: - image: ghcr.io/wg-easy/wg-easy - container_name: wg-easy - restart: unless-stopped - volumes: - - ./etc_wireguard:/etc/wireguard - environment: - # Required settings - - WG_HOST=wg.riverrooks.dev - - # Optional settings - - WG_PORT=51820 # WireGuard UDP port - - WG_DEFAULT_DNS=1.1.1.1 - - WG_ALLOWED_IPS=10.8.0.0/24 - - cap_add: - - NET_ADMIN - - SYS_MODULE - sysctls: - - net.ipv4.conf.all.src_valid_mark=1 - - net.ipv4.ip_forward=1 - - # Ports: We map the VPN port (UDP) directly to the host. - # The Web UI (51821) is handled by Traefik labels instead. - ports: - - "51820:51820/udp" - - networks: - - traefik - - labels: - - "traefik.enable=true" - - "traefik.http.routers.wg-easy.rule=Host(`wg.riverrooks.dev`)" - - "traefik.http.routers.wg-easy.entrypoints=websecure" - - "traefik.http.routers.wg-easy.tls.certresolver=myresolver" - - "traefik.http.services.wg-easy.loadbalancer.server.port=51821" -networks: - traefik: - external: true diff --git a/whoami.yml b/whoami.yml index 326ac33..b9b1b13 100644 --- a/whoami.yml +++ b/whoami.yml @@ -1,7 +1,8 @@ +# whoami.yml works as a nice tester to check if the network is exposed services: whoami: image: traefik/whoami - container_name: whoami + container_name: whoami-public restart: unless-stopped labels: - "traefik.enable=true" @@ -10,6 +11,17 @@ services: - "traefik.http.routers.whoami.tls.certresolver=basic" networks: - traefik + whoami-defenk: + image: traefik/whoami + container_name: whoami-vpn + restart: unless-stopped + # labels: + # - "traefik.enable=true" + # - "traefik.http.routers.whoami.rule=Host(`10.8.0.1`)" + # - "traefik.http.routers.whoami.entrypoints=websecure" + # # - "traefik.http.routers.whoami.tls.certresolver=basic" + networks: + - traefik networks: traefik: