From 8eefcac5e0a9fa110cb6945d0efa09f371c765ba Mon Sep 17 00:00:00 2001 From: Alex Lebens Date: Wed, 15 Jan 2025 16:14:36 -0600 Subject: [PATCH] add blocky --- hosts/ps10rp/blocky/compose.yaml | 36 +++++++ hosts/ps10rp/blocky/config.yml | 117 +++++++++++++++++++++++ hosts/ps10rp/homepage/docker-compose.yml | 16 ---- 3 files changed, 153 insertions(+), 16 deletions(-) create mode 100644 hosts/ps10rp/blocky/compose.yaml create mode 100644 hosts/ps10rp/blocky/config.yml diff --git a/hosts/ps10rp/blocky/compose.yaml b/hosts/ps10rp/blocky/compose.yaml new file mode 100644 index 000000000..857985938 --- /dev/null +++ b/hosts/ps10rp/blocky/compose.yaml @@ -0,0 +1,36 @@ +--- +version: "3.7" + +services: + tailscale-blocky: + image: ghcr.io/tailscale/tailscale:v1.78.3 + container_name: tailscale-blocky + cap_add: + - net_admin + - sys_module + environment: + - TS_STATE_DIR=/var/lib/tailscale + - TS_ENABLE_METRICS=true + - TS_HOSTNAME=blocky-ps10rp + network_mode: service:blocky + restart: always + volumes: + - tailscale:/var/lib/tailscale + devices: + - /dev/net/tun:/dev/net/tun + + blocky: + image: ghcr.io/0xerr0r/blocky:v0.24 + container_name: blocky + environment: + - TZ=America/Chicago + ports: + - 53:53/tcp + - 53:53/udp + - 4000:4000/tcp + restart: always + volumes: + - ./config.yml:/app/config.yml + +volumes: + tailscale: diff --git a/hosts/ps10rp/blocky/config.yml b/hosts/ps10rp/blocky/config.yml new file mode 100644 index 000000000..43e999906 --- /dev/null +++ b/hosts/ps10rp/blocky/config.yml @@ -0,0 +1,117 @@ +upstreams: + init: + strategy: fast + groups: + default: + - tcp-tls:1.1.1.1:853 + - tcp-tls:1.0.0.1:853 + strategy: parallel_best + timeout: 2s + +connectIPVersion: v4 + +customDNS: + filterUnmappedTypes: false + zone: | + $ORIGIN lebens-home.net. + $TTL 86400 + + ;; Name Server + IN NS patryk.ns.cloudflare.com. + IN NS veda.ns.cloudflare.com. + IN NS dns1. + + dns1 IN A 192.168.5.41 + + + ;; Computer Names + nw02un IN A 192.168.5.1 + + ps10rp IN A 192.168.5.41 ; PiBox + + pd05wd IN A 192.168.5.64 ; Desktop + pl02mc IN A 192.168.5.249 ; Laptop + + dv03pr IN A 192.168.5.27 ; 3D Printer + + + ;; Common Names + unifi IN CNAME nw02un + cockpit-ps10rp IN CNAME ps10rp + printer IN CNAME dv03pr + + + ;; Application Names + treafik-ps10rp IN CNAME ps10rp + gitea IN CNAME ps10rp + www IN CNAME ps10rp + homepage IN CNAME ps10rp + +blocking: + denylists: + sus: + - https://v.firebog.net/hosts/static/w3kbl.txt + ads: + - https://v.firebog.net/hosts/AdguardDNS.txt + - https://v.firebog.net/hosts/Admiral.txt + - https://v.firebog.net/hosts/Easylist.txt + - https://adaway.org/hosts.txt + priv: + - https://v.firebog.net/hosts/Easyprivacy.txt + - https://v.firebog.net/hosts/Prigent-Ads.txt + mal: + - https://v.firebog.net/hosts/Prigent-Crypto.txt + - https://osint.digitalside.it/Threat-Intel/lists/latestdomains.txt + pro: + - https://raw.githubusercontent.com/hagezi/dns-blocklists/main/wildcard/pro.txt + clientGroupsBlock: + default: + - sus + - ads + - priv + - mal + - pro + blockType: zeroIp + blockTTL: 1m + loading: + refreshPeriod: 24h + downloads: + timeout: 60s + attempts: 5 + cooldown: 10s + concurrency: 16 + strategy: fast + maxErrorsPerSource: 5 + +caching: + minTime: 5m + maxTime: 30m + maxItemsCount: 0 + prefetching: true + prefetchExpires: 2h + prefetchThreshold: 5 + prefetchMaxItemsCount: 0 + cacheTimeNegative: 30m + +prometheus: + enable: true + path: /metrics + +queryLog: + type: console + logRetentionDays: 7 + creationAttempts: 1 + creationCooldown: 2s + flushInterval: 30s + +minTlsServeVersion: 1.3 + +ports: + dns: 53 + http: 4000 + +log: + level: info + format: text + timestamp: true + privacy: false diff --git a/hosts/ps10rp/homepage/docker-compose.yml b/hosts/ps10rp/homepage/docker-compose.yml index c396ccd90..38371e574 100644 --- a/hosts/ps10rp/homepage/docker-compose.yml +++ b/hosts/ps10rp/homepage/docker-compose.yml @@ -17,8 +17,6 @@ services: restart: always volumes: - config:/app/config - - images:/app/public/images - - icons:/app/public/icons dockerproxy: container_name: homepage-dockerproxy @@ -48,17 +46,3 @@ volumes: type: none o: bind device: /mnt/data/containers/homepage/config - - images: - driver: local - driver_opts: - type: none - o: bind - device: /mnt/data/containers/homepage/images - - icons: - driver: local - driver_opts: - type: none - o: bind - device: /mnt/data/containers/homepage/icons