From eef9b6be341cbd90e507f8f24f404116a381c243 Mon Sep 17 00:00:00 2001 From: Junwei Zhao Date: Wed, 8 Jan 2025 18:22:35 +1100 Subject: [PATCH] Switch to deploy adguard on plex --- {home-apps => archive}/adguard.yaml | 0 home-apps/home-proxy.yaml | 40 +++++++++++++++++++ .../adguard/docker-compose.yaml | 25 ++++++++++++ 3 files changed, 65 insertions(+) rename {home-apps => archive}/adguard.yaml (100%) create mode 100644 legacy-docker-compose/adguard/docker-compose.yaml diff --git a/home-apps/adguard.yaml b/archive/adguard.yaml similarity index 100% rename from home-apps/adguard.yaml rename to archive/adguard.yaml diff --git a/home-apps/home-proxy.yaml b/home-apps/home-proxy.yaml index 83ef3e5..236d903 100644 --- a/home-apps/home-proxy.yaml +++ b/home-apps/home-proxy.yaml @@ -150,6 +150,16 @@ data: } encode gzip zstd } + # Adguard web + :8084 { + log { + level {env.CADDY_LOG_LEVEL} + output stderr + } + + reverse_proxy 192.168.1.11:28888 + encode gzip zstd + } --- @@ -269,6 +279,36 @@ spec: --- +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: adguard-ingress + namespace: home-apps + annotations: + kubernetes.io/ingress.class: "nginx" + kubernetes.io/tls-acme: "true" + cert-manager.io/cluster-issuer: "letsencrypt-prod" + nginx.ingress.kubernetes.io/auth-url: "https://id.junv.cc/oauth2/auth" + nginx.ingress.kubernetes.io/auth-signin: "https://id.junv.cc/oauth2/start?rd=https%3A%2F%2F$host$request_uri" +spec: + tls: + - hosts: + - adguard.junv.cc + secretName: adguard-tls + rules: + - host: adguard.junv.cc + http: + paths: + - backend: + service: + name: home-proxy + port: + number: 8084 + path: / + pathType: Prefix + +--- + apiVersion: networking.k8s.io/v1 kind: Ingress metadata: diff --git a/legacy-docker-compose/adguard/docker-compose.yaml b/legacy-docker-compose/adguard/docker-compose.yaml new file mode 100644 index 0000000..db0bc51 --- /dev/null +++ b/legacy-docker-compose/adguard/docker-compose.yaml @@ -0,0 +1,25 @@ +version: '3' +services: + adguard: + container_name: adguard + image: adguard/adguardhome + restart: unless-stopped + volumes: + - /mnt/data/adguard/work:/opt/adguardhome/work + - /mnt/data/adguard/conf:/opt/adguardhome/conf + cap_add: + - NET_ADMIN + ports: + - "53:53/tcp" + - "53:53/udp" + - "67:67/udp" + - "68:68/udp" + - "28888:80/tcp" + - "28443:443/tcp" + - "28443:443/udp" + - "3000:3000/tcp" + - "853:853/tcp" + - "853:853/udp" + - "5443:5443/tcp" + - "5443:5443/udp" + - "6060:6060/tcp"