From 293edf5bb1f443d5f834f2f8b428f1036a760f09 Mon Sep 17 00:00:00 2001 From: Ernest Mallett Date: Thu, 26 Jun 2025 09:09:16 -0500 Subject: [PATCH 1/5] Updated some configuration and added technitium config for storage --- .../manual/technitium-advanced-blocking.json | 81 +++++++++++++++++++ config/manual/technitium-kids-blocked | 7 ++ config/stacks/databases.yaml | 61 ++++++++++++++ config/stacks/karakeep.yaml | 1 - config/stacks/media-servers.yaml | 43 +++++++--- 5 files changed, 180 insertions(+), 13 deletions(-) create mode 100644 config/manual/technitium-advanced-blocking.json create mode 100644 config/manual/technitium-kids-blocked create mode 100644 config/stacks/databases.yaml diff --git a/config/manual/technitium-advanced-blocking.json b/config/manual/technitium-advanced-blocking.json new file mode 100644 index 0000000..c44f96b --- /dev/null +++ b/config/manual/technitium-advanced-blocking.json @@ -0,0 +1,81 @@ +{ + "enableBlocking": true, + "blockListUrlUpdateIntervalHours": 6, + "localEndPointGroupMap": { + "127.0.0.1": "bypass" + }, + "networkGroupMap": { + "0.0.0.0/0": "everyone", + "[::]/0": "everyone", + "192.168.2.33": "kids", + "192.168.2.34": "kids", + "192.168.2.35": "kids", + "192.168.2.36": "kids", + "192.168.2.37": "kids" + }, + "groups": [ + { + "name": "everyone", + "enableBlocking": false, + "allowTxtBlockingReport": true, + "blockAsNxDomain": true, + "blockingAddresses": [ + "0.0.0.0", + "::" + ], + "allowed": [], + "blocked": [], + "allowListUrls": [], + "blockListUrls": [], + "allowedRegex": [], + "blockedRegex": [], + "regexAllowListUrls": [], + "regexBlockListUrls": [], + "adblockListUrls": [] + }, + { + "name": "kids", + "enableBlocking": true, + "allowTxtBlockingReport": true, + "blockAsNxDomain": true, + "blockingAddresses": [ + "0.0.0.0", + "::" + ], + "allowed": [], + "blocked": [], + "allowListUrls": [], + "blockListUrls": [ + { + "url": "https://raw.githubusercontent.com/StevenBlack/hosts/master/alternates/social/hosts", + "blockAsNxDomain": true, + "blockingAddresses": [] + } + ], + "allowedRegex": [], + "blockedRegex": [], + "regexAllowListUrls": [], + "regexBlockListUrls": [], + "adblockListUrls": [] + }, + { + "name": "bypass", + "enableBlocking": true, + "allowTxtBlockingReport": true, + "blockAsNxDomain": true, + "blockingAddresses": [ + "0.0.0.0", + "::" + ], + "allowed": [], + "blocked": [], + "allowListUrls": [], + "blockListUrls": [], + "allowedRegex": [], + "blockedRegex": [], + "regexAllowListUrls": [], + "regexBlockListUrls": [], + "adblockListUrls": [] + } + ] +} \ No newline at end of file diff --git a/config/manual/technitium-kids-blocked b/config/manual/technitium-kids-blocked new file mode 100644 index 0000000..f631a87 --- /dev/null +++ b/config/manual/technitium-kids-blocked @@ -0,0 +1,7 @@ +0.0.0.0 googleusercontent.com +0.0.0.0 youtube.com +0.0.0.0 bigolive.tv +0.0.0.0 claspws.tv +0.0.0.0 ifood.tv +0.0.0.0 ravm.tv +0.0.0.0 play.works \ No newline at end of file diff --git a/config/stacks/databases.yaml b/config/stacks/databases.yaml new file mode 100644 index 0000000..1c599be --- /dev/null +++ b/config/stacks/databases.yaml @@ -0,0 +1,61 @@ +media-servers: + zone_name: "dcapi.app" + env: + - "TZ=America/Chicago" + mounts: + - "/etc/localtime:/etc/localtime:ro" + generated_secrets: + networks: + db-network: + internal: true + driver: bridge + services: + mongodb: + dns: + enabled: false + network: + networks: + - name: "db-network" + auth: + enabled: false + icon: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/mongodb.png" + service_name: "mongodb" + description: "" + image_name: "mongo:latest" + env: + - "MONGO_INITDB_ROOT_USERNAME=" + - "MONGO_INITDB_ROOT_PASSWORD=" + mounts: + - "/mnt/user/DataStore/mongo-data:/data/db" + postgres: + image: "postgres:14" + icon: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/postgres.png" + service_name: "postgres" + volumes: + - "/mnt/user/DataStore/postgres-data:/var/lib/postgresql/data" + dns: + enabled: false + network: + networks: + - name: "db-network" + environment: + - "POSTGRES_USER=" + - "POSTGRES_PASSWORD=" + - "POSTGRES_DB=" + redis: + image: "redis:latest" + service_name: "redis" + icon: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/redis.png" + volumes: + - "/mnt/user/DataStore/redis-data:/data" + dns: + enabled: false + network: + networks: + - name: "db-network" + commands: + - "/bin/sh" + - "-c" + - "redis-server --appendonly yes --requirepass \"$${REDIS_PASSWORD:?REDIS_PASSWORD variable is not set}\"" + environment: + - "REDIS_PASSWORD=" \ No newline at end of file diff --git a/config/stacks/karakeep.yaml b/config/stacks/karakeep.yaml index a7ad5bd..443c357 100644 --- a/config/stacks/karakeep.yaml +++ b/config/stacks/karakeep.yaml @@ -4,7 +4,6 @@ karakeep: mounts: generated_secrets: - "NEXTAUTH_SECRET" - #- "MEILI_MASTER_KEY" networks: karakeep: internal: true diff --git a/config/stacks/media-servers.yaml b/config/stacks/media-servers.yaml index 62abd18..e76e6ce 100644 --- a/config/stacks/media-servers.yaml +++ b/config/stacks/media-servers.yaml @@ -11,16 +11,16 @@ media-servers: networks: services: jellyfin: - dns: + dns: enabled: true domain_name: "media.mallett.family" - network: + network: internal: false service_port: 8096 networks: - name: "br1" ip_address: "192.168.5.46" - auth: + auth: enabled: true group: "Media" oauth: @@ -35,12 +35,31 @@ media-servers: - "openid" - "email" - "profile" - icon: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/jellyfin.png" - service_name: "jellyfin" - description: "Jellyfin is a Free Software Media System that puts you in control of managing and streaming your media." - image_name: "linuxserver/jellyfin:10.10.7" - env: - - "PUID=0" - - "PGID=0" - mounts: - - "/mnt/user/appdata/jellyfin:/config" \ No newline at end of file + icon: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/jellyfin.png" + service_name: "jellyfin" + description: "Jellyfin is a Free Software Media System that puts you in control of managing and streaming your media." + image_name: "linuxserver/jellyfin:10.10.7" + env: + - "PUID=0" + - "PGID=0" + mounts: + - "/mnt/user/appdata/jellyfin:/config" + - "/mnt/user/appdata/jellyfin/transcode:/transcode" + plex: + image_name: "linuxserver/plex:1.41.8" + service_name: "plex" + icon: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/plex.png" + mounts: + - "/mnt/user/appdata/binhex-plex:/config" + - "/mnt/user/appdata/binhex-plex/transcode:/transcode" + dns: + enabled: true + domain_name: "plex.mallett.family" + network: + internal: false + service_port: 32400 + networks: + - name: "br1" + ip_address: "192.168.5.45" + env: + - "PLEX_CLAIM=SOMECLAIMTOKEN" \ No newline at end of file From e9d0a28fe430502595e69089338a7d9a18e3d1a2 Mon Sep 17 00:00:00 2001 From: Ernest Mallett Date: Fri, 15 Aug 2025 07:50:21 -0500 Subject: [PATCH 2/5] dns blocking update --- .../manual/technitium-advanced-blocking.json | 40 ++++++++++++++++--- 1 file changed, 34 insertions(+), 6 deletions(-) diff --git a/config/manual/technitium-advanced-blocking.json b/config/manual/technitium-advanced-blocking.json index c44f96b..2a43a7a 100644 --- a/config/manual/technitium-advanced-blocking.json +++ b/config/manual/technitium-advanced-blocking.json @@ -1,17 +1,18 @@ { "enableBlocking": true, - "blockListUrlUpdateIntervalHours": 6, + "blockListUrlUpdateIntervalHours": 24, "localEndPointGroupMap": { "127.0.0.1": "bypass" }, "networkGroupMap": { - "0.0.0.0/0": "everyone", - "[::]/0": "everyone", "192.168.2.33": "kids", "192.168.2.34": "kids", "192.168.2.35": "kids", "192.168.2.36": "kids", - "192.168.2.37": "kids" + "192.168.2.37": "kids", + "192.168.2.224": "kids", + "0.0.0.0/0": "everyone", + "[::]/0": "everyone" }, "groups": [ { @@ -24,7 +25,9 @@ "::" ], "allowed": [], - "blocked": [], + "blocked": [ + "example.com" + ], "allowListUrls": [], "blockListUrls": [], "allowedRegex": [], @@ -43,13 +46,38 @@ "::" ], "allowed": [], - "blocked": [], + "blocked": [ + "discord.com", + "youtube.com", + "bigolive.tv", + "claspws.tv", + "spotify.com", + "ifood.tv", + "ravm.tv", + "play.works", + "teads.tv", + "vod.delivery.roku.com", + "vod-playlist.sr.roku.com", + "midland.sb.roku.com", + "cdn-apple.com", + "discover.provider.plex.tv" + ], "allowListUrls": [], "blockListUrls": [ { "url": "https://raw.githubusercontent.com/StevenBlack/hosts/master/alternates/social/hosts", "blockAsNxDomain": true, "blockingAddresses": [] + }, + { + "url": "https://github.com/StevenBlack/hosts/raw/refs/heads/master/alternates/fakenews-porn-only/hosts", + "blockAsNxDomain": true, + "blockingAddresses": [] + }, + { + "url": "https://github.com/StevenBlack/hosts/raw/refs/heads/master/alternates/gambling-only/hosts", + "blockAsNxDomain": true, + "blockingAddresses": [] } ], "allowedRegex": [], From d99eed6727114649f45c2d60a122b9828cbcb504 Mon Sep 17 00:00:00 2001 From: Ernest Mallett Date: Fri, 15 Aug 2025 08:12:29 -0500 Subject: [PATCH 3/5] Readarr no longer supported --- config/stacks/arr.yaml | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/config/stacks/arr.yaml b/config/stacks/arr.yaml index 813e188..51df0f9 100644 --- a/config/stacks/arr.yaml +++ b/config/stacks/arr.yaml @@ -86,22 +86,4 @@ service_name: "lidarr" image_name: "linuxserver/lidarr:2.13.0-develop" mounts: - - "/mnt/user/Arr/lidarr-data:/config" - readarr: - dns: - enabled: true - domain_name: "readarr.dcapi.app" - network: - internal: true - service_port: 8787 - networks: - - name: "br1" - ip_address: "192.168.5.26" - auth: - enabled: true - proxy: true - group: "Arr" - service_name: "readarr" - image_name: "linuxserver/readarr:0.4.17-develop" - mounts: - - "/mnt/user/Arr/readarr-data:/config" + - "/mnt/user/Arr/lidarr-data:/config" \ No newline at end of file From a9e178474f0798d6a970a9a5af0d10777fae0875 Mon Sep 17 00:00:00 2001 From: Ernest Mallett Date: Fri, 15 Aug 2025 08:20:03 -0500 Subject: [PATCH 4/5] Service version updates --- config/stacks/arr.yaml | 6 +++--- config/stacks/karakeep.yaml | 4 ++-- config/stacks/media-servers.yaml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/stacks/arr.yaml b/config/stacks/arr.yaml index 51df0f9..bfe8f12 100644 --- a/config/stacks/arr.yaml +++ b/config/stacks/arr.yaml @@ -25,7 +25,7 @@ group: "Arr" icon: "https://static-00.iconduck.com/assets.00/prowlarr-icon-512x512-v9ekdjxx.png" service_name: "prowlarr" - image_name: "linuxserver/prowlarr:1.37.0" + image_name: "linuxserver/prowlarr:2.0.3-develop" domain_name: "prowlarr.dcapi.app" mounts: - "/mnt/user/Arr/prowlarr-data:/config" @@ -45,7 +45,7 @@ group: "Arr" icon: "https://static-00.iconduck.com/assets.00/sonarr-icon-1024x1024-wkay604k.png" service_name: "sonarr" - image_name: "linuxserver/sonarr:4.0.14.2939-ls281" + image_name: "linuxserver/sonarr:4.0.15" domain_name: "sonarr.dcapi.app" mounts: - "/mnt/user/Arr/sonarr-data:/config" @@ -84,6 +84,6 @@ proxy: true group: "Arr" service_name: "lidarr" - image_name: "linuxserver/lidarr:2.13.0-develop" + image_name: "linuxserver/lidarr:nightly-2.13.2.4685-ls165" mounts: - "/mnt/user/Arr/lidarr-data:/config" \ No newline at end of file diff --git a/config/stacks/karakeep.yaml b/config/stacks/karakeep.yaml index 443c357..563207b 100644 --- a/config/stacks/karakeep.yaml +++ b/config/stacks/karakeep.yaml @@ -37,7 +37,7 @@ karakeep: icon: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/karakeep.png" service_name: "karakeep" description: "Karakeep is an open source \"Bookmark Everything\" app that uses AI for automatically tagging the content you throw at it. The app is built with self-hosting as a first class citizen." - image_name: "ghcr.io/karakeep-app/karakeep:0.25.0" + image_name: "ghcr.io/karakeep-app/karakeep:0.26.0" env: - "MEILI_ADDR=http://meillisearch:7700" - "BROWSER_WEB_URL=http://chrome:9222" @@ -62,7 +62,7 @@ karakeep: enabled: false icon: "https://static-00.iconduck.com/assets.00/search-icon-512x512-dlh8ei42.png" service_name: "meillisearch" - image_name: "getmeili/meilisearch:v1.13.3" + image_name: "getmeili/meilisearch:v1.17.1" mounts: - "/mnt/user/DataStore/meili/data:/meili_data" networks: diff --git a/config/stacks/media-servers.yaml b/config/stacks/media-servers.yaml index e76e6ce..929a36e 100644 --- a/config/stacks/media-servers.yaml +++ b/config/stacks/media-servers.yaml @@ -46,7 +46,7 @@ media-servers: - "/mnt/user/appdata/jellyfin:/config" - "/mnt/user/appdata/jellyfin/transcode:/transcode" plex: - image_name: "linuxserver/plex:1.41.8" + image_name: "linuxserver/plex:1.42.1" service_name: "plex" icon: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/plex.png" mounts: From e1eabccd2482405ae773db2a93023cd8d9e0b45a Mon Sep 17 00:00:00 2001 From: Ernest Mallett Date: Fri, 15 Aug 2025 08:25:22 -0500 Subject: [PATCH 5/5] Update database stack name --- config/stacks/databases.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/stacks/databases.yaml b/config/stacks/databases.yaml index 1c599be..0056f76 100644 --- a/config/stacks/databases.yaml +++ b/config/stacks/databases.yaml @@ -1,4 +1,4 @@ -media-servers: +databases: zone_name: "dcapi.app" env: - "TZ=America/Chicago"