diff --git a/adguard/conf/AdGuardHome.yaml b/adguard/conf/AdGuardHome.yaml index 379fb8e..2668bf6 100644 --- a/adguard/conf/AdGuardHome.yaml +++ b/adguard/conf/AdGuardHome.yaml @@ -18,6 +18,8 @@ dns: port: 53 anonymize_client_ip: false ratelimit: 0 + ratelimit_subnet_len_ipv4: 24 + ratelimit_subnet_len_ipv6: 56 ratelimit_whitelist: [] refuse_any: true upstream_dns: @@ -206,7 +208,24 @@ user_rules: - '@@||lavieenrose.com^$important' - '||eventtrack.pandasecurity.com^$important' - '@@||telemetry-in.battle.net^$important' - - "" + - '#' + - '## Sperre für Luminar ' + - '#' + - '||auth.macphun.com^$important' + - '||luminar3win.update.skylum.com^$important' + - '||luminar3.s3-accelerate.amazonaws.com^$important' + - '||luminar4win.update.skylum.com^$important' + - '||luminar4.s3-accelerate.amazonaws.com^$important' + - '||stats-api.skylum.com^$important' + - '||geotargetly-1a441.appspot.com^$important' + - '||fx.macphun.com^$important' + - '||canonicalizer.ucsuri.tcs^$important' + - '||auth.macphun.com^$important' + - '||stats-api.skylum.com^$important' + - '||api.photolemur.com^$important' + - '||media.macphun.com^$important' + - '||luminaraiwin.skylum.com^$important' + - '||luminarneowin.skylum.com^$important' dhcp: enabled: false interface_name: eth0 @@ -430,6 +449,54 @@ clients: use_global_blocked_services: true ignore_querylog: false ignore_statistics: false + - safe_search: + enabled: false + bing: true + duckduckgo: true + google: true + pixabay: true + yandex: true + youtube: true + blocked_services: + schedule: + time_zone: Europe/Berlin + ids: [] + name: S20+ Lars + ids: + - 192.168.0.60 + tags: [] + upstreams: [] + use_global_settings: false + filtering_enabled: true + parental_enabled: false + safebrowsing_enabled: true + use_global_blocked_services: true + ignore_querylog: false + ignore_statistics: false + - safe_search: + enabled: false + bing: true + duckduckgo: true + google: true + pixabay: true + yandex: true + youtube: true + blocked_services: + schedule: + time_zone: Europe/Berlin + ids: [] + name: S7-Lars + ids: + - 192.168.0.62 + tags: [] + upstreams: [] + use_global_settings: false + filtering_enabled: true + parental_enabled: false + safebrowsing_enabled: true + use_global_blocked_services: true + ignore_querylog: false + ignore_statistics: false - safe_search: enabled: false bing: false diff --git a/wireshark/docker-compose.yml b/wireshark/docker-compose.yml deleted file mode 100644 index 82fce74..0000000 --- a/wireshark/docker-compose.yml +++ /dev/null @@ -1,19 +0,0 @@ -version: "2.1" -services: - wireshark: - image: lscr.io/linuxserver/wireshark:latest - container_name: wireshark - cap_add: - - NET_ADMIN - security_opt: - - seccomp:unconfined #optional - #network_mode: host - environment: - - PUID=1000 - - PGID=1000 - - TZ=Europe/Berlin - volumes: - - ./config:/config - ports: - - 3010:3000 #optional - restart: unless-stopped \ No newline at end of file diff --git a/youtubeDL/.env.sample b/youtubeDL/.env.sample deleted file mode 100644 index 632619a..0000000 --- a/youtubeDL/.env.sample +++ /dev/null @@ -1,2 +0,0 @@ -NFS_SERVER=192.168.0.xxx # oder hostname oder Domain -PFAD=/Pfad/zum/Ordner \ No newline at end of file diff --git a/youtubeDL/README.md b/youtubeDL/README.md deleted file mode 100644 index 18e7aee..0000000 --- a/youtubeDL/README.md +++ /dev/null @@ -1,2 +0,0 @@ -

Download.png

-

Docker-Hub

\ No newline at end of file diff --git a/youtubeDL/docker-compose.yml b/youtubeDL/docker-compose.yml deleted file mode 100644 index 66731c2..0000000 --- a/youtubeDL/docker-compose.yml +++ /dev/null @@ -1,25 +0,0 @@ -version: "3.4" -services: - ytdl_material: - image: tzahi12345/youtubedl-material:latest - container_name: youtubeDL - environment: - ALLOW_CONFIG_MUTATIONS: 'true' - volumes: - - ./appdata:/app/appdata - - youtubeDL:/app/audio - - ./video:/app/video - - ./subscriptions:/app/subscriptions - - ./users:/app/users - ports: - - "8998:17442" - restart: always - -volumes: - youtubeDL: - name: youtubeDL - driver: local - driver_opts: - type: nfs - o: addr=${NFS_SERVER},rw - device: ":${PFAD}" \ No newline at end of file