From 0f11448bcc0378802aab36b10868271ed4519a6a Mon Sep 17 00:00:00 2001
From: Michael Grote <michael.grote@posteo.de>
Date: Tue, 3 Oct 2023 18:07:06 +0200
Subject: [PATCH] remove blocky (#576)

Reviewed-on: https://git.mgrote.net/mg/homeserver/pulls/576
Co-authored-by: Michael Grote <michael.grote@posteo.de>
Co-committed-by: Michael Grote <michael.grote@posteo.de>
---
 docker-compose/blocky/config.yml.j2         | 53 ---------------------
 docker-compose/blocky/docker-compose.yml.j2 | 18 -------
 host_vars/docker10.grote.lan.yml            |  2 -
 3 files changed, 73 deletions(-)
 delete mode 100644 docker-compose/blocky/config.yml.j2
 delete mode 100644 docker-compose/blocky/docker-compose.yml.j2

diff --git a/docker-compose/blocky/config.yml.j2 b/docker-compose/blocky/config.yml.j2
deleted file mode 100644
index 978f8878..00000000
--- a/docker-compose/blocky/config.yml.j2
+++ /dev/null
@@ -1,53 +0,0 @@
-# https://0xerr0r.github.io/blocky/v0.20/configuration/#basic-configuration
-upstream:
-  default:
-    - 9.9.9.9
-    - 8.8.8.8
-upstreamTimeout: 2s
-
-port: 53
-httpPort: 4000
-
-connectIPVersion: v4
-
-queryLog:
-  type: console
-
-customDNS:
-  mapping:
-    mgrote.net: 192.168.2.43 # nötig damit z.B. oxidized pushen kann
-
-conditional:
-  mapping:
-    grote.lan: 192.168.2.1
-
-filtering:
-  queryTypes:
-    - AAAA # disable IPv6/AAAA Queries
-
-blocking:
-  startStrategy: failOnError # like blocking but blocky will shut down if any download fails
-  blockType: nxDomain
-  blockTTL: 360s
-  refreshPeriod: 60m
-  blackLists:
-    ads:
-      - http://sysctl.org/cameleon/hosts
-      - https://raw.githubusercontent.com/StevenBlack/hosts/master/data/KADhosts/hosts
-      - https://raw.githubusercontent.com/StevenBlack/hosts/master/data/add.Spam/hosts
-      - https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts
-      - https://v.firebog.net/hosts/AdguardDNS.txt
-      - https://s3.amazonaws.com/lists.disconnect.me/simple_ad.txt
-      - https://raw.githubusercontent.com/r-a-y/mobile-hosts/master/AdguardMobileAds.txt
-      - https://raw.githubusercontent.com/r-a-y/mobile-hosts/master/AdguardMobileSpyware.txt
-#      - |
-#        # inline definition with YAML literal block scalar style
-#        someadsdomain.com
-#        anotheradsdomain.com
-#        # this is a regex
-#        /^banners?[_.-]/
-#  whiteLists:
-#    ads:
-#      - |
-#        # inline definition with YAML literal block scalar style
-#        whitelistdomain.com
diff --git a/docker-compose/blocky/docker-compose.yml.j2 b/docker-compose/blocky/docker-compose.yml.j2
deleted file mode 100644
index e7895ce2..00000000
--- a/docker-compose/blocky/docker-compose.yml.j2
+++ /dev/null
@@ -1,18 +0,0 @@
-version: "2.1"
-services:
-  blocky:
-    image: spx01/blocky
-    container_name: blocky
-    restart: always
-    ports:
-      - "53:53/tcp"
-      - "53:53/udp"
-    environment:
-      TZ: Europe/Berlin
-    volumes:
-      # config file
-      - ./config.yml:/app/config.yml
-    labels:
-      com.centurylinklabs.watchtower.enable: true
-
-# kann mit dig @192.168.2.43 -p 54 alternate.de getestet werden
diff --git a/host_vars/docker10.grote.lan.yml b/host_vars/docker10.grote.lan.yml
index a38258ff..d3c32cea 100644
--- a/host_vars/docker10.grote.lan.yml
+++ b/host_vars/docker10.grote.lan.yml
@@ -49,8 +49,6 @@
       network: traefik
     - name: watchtower
       state: present
-    - name: blocky
-      state: present
     - name: routeros-config-export
       state: present
     - name: registry