From 839b71f9a95d4e8bbfaccb3724cef0a04b8baf8b Mon Sep 17 00:00:00 2001 From: Alex Lebens Date: Sat, 11 Jan 2025 16:18:51 -0600 Subject: [PATCH] update compose --- hosts/ps08rp/blocky/compose.yaml | 2 +- hosts/ps08rp/blocky/config.yml | 2 -- hosts/ps09rp/blocky/compose.yaml | 7 +++---- hosts/ps09rp/blocky/config.yml | 2 -- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/hosts/ps08rp/blocky/compose.yaml b/hosts/ps08rp/blocky/compose.yaml index bfd9a57e3..5cc803d9c 100644 --- a/hosts/ps08rp/blocky/compose.yaml +++ b/hosts/ps08rp/blocky/compose.yaml @@ -21,7 +21,7 @@ services: blocky: image: ghcr.io/0xerr0r/blocky:v0.24 - container_name: blocky-ps08rp + container_name: blocky environment: - TZ=America/Chicago ports: diff --git a/hosts/ps08rp/blocky/config.yml b/hosts/ps08rp/blocky/config.yml index 242d0d874..14ef1847c 100644 --- a/hosts/ps08rp/blocky/config.yml +++ b/hosts/ps08rp/blocky/config.yml @@ -78,8 +78,6 @@ customDNS: gitea IN CNAME cl01tl-endpoint.alexlebens.net vault IN CNAME cl01tl-endpoint.alexlebens.net - - blocking: denylists: sus: diff --git a/hosts/ps09rp/blocky/compose.yaml b/hosts/ps09rp/blocky/compose.yaml index 3c96ec9a1..68012b2e0 100644 --- a/hosts/ps09rp/blocky/compose.yaml +++ b/hosts/ps09rp/blocky/compose.yaml @@ -5,12 +5,14 @@ services: tailscale-blocky: image: ghcr.io/tailscale/tailscale:v1.78.3 container_name: tailscale-blocky - hostname: blocky-ps09rp cap_add: - net_admin - sys_module environment: - TS_STATE_DIR=/var/lib/tailscale + - TS_ENABLE_METRICS=true + - TS_HOSTNAME=blocky-ps09rp + network_mode: service:blocky restart: always volumes: - tailscale:/var/lib/tailscale @@ -22,7 +24,6 @@ services: container_name: blocky environment: - TZ=America/Chicago - network_mode: service:tailscale-blocky ports: - 53:53/tcp - 53:53/udp @@ -30,8 +31,6 @@ services: restart: always volumes: - ./config.yml:/app/config.yml - devices: - - /etc/localtime:/etc/localtime:ro volumes: tailscale: diff --git a/hosts/ps09rp/blocky/config.yml b/hosts/ps09rp/blocky/config.yml index 242d0d874..14ef1847c 100644 --- a/hosts/ps09rp/blocky/config.yml +++ b/hosts/ps09rp/blocky/config.yml @@ -78,8 +78,6 @@ customDNS: gitea IN CNAME cl01tl-endpoint.alexlebens.net vault IN CNAME cl01tl-endpoint.alexlebens.net - - blocking: denylists: sus: