mirror of
https://github.com/optim-enterprises-bv/homelab.git
synced 2025-11-01 18:37:52 +00:00
feat(pi-hole): Configuring Pi-Hole lists
This commit is contained in:
Vegard Hagen
@@ -1,32 +0,0 @@
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: adlists.list
|
||||
namespace: pi-hole
|
||||
data:
|
||||
adlists.list: |
|
||||
https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts
|
||||
https://mirror1.malwaredomains.com/files/justdomains
|
||||
http://sysctl.org/cameleon/hosts
|
||||
https://s3.amazonaws.com/lists.disconnect.me/simple_tracking.txt
|
||||
https://s3.amazonaws.com/lists.disconnect.me/simple_ad.txt
|
||||
https://hosts-file.net/ad_servers.txt
|
||||
https://blocklist.site/app/dl/porn
|
||||
https://blocklist.site/app/dl/fakenews
|
||||
https://blocklist.site/app/dl/tracking
|
||||
https://blocklist.site/app/dl/drugs
|
||||
https://blocklist.site/app/dl/phishing
|
||||
https://blocklist.site/app/dl/gambling
|
||||
https://blocklist.site/app/dl/malware
|
||||
https://blocklist.site/app/dl/spam
|
||||
https://blocklist.site/app/dl/ads
|
||||
https://raw.githubusercontent.com/Perflyst/PiHoleBlocklist/master/SmartTV.txt
|
||||
https://raw.githubusercontent.com/Perflyst/PiHoleBlocklist/master/android-tracking.txt
|
||||
https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/spy.txt
|
||||
https://raw.githubusercontent.com/StevenBlack/hosts/master/data/add.2o7Net/hosts
|
||||
https://gitlab.com/quidsup/notrack-blocklists/raw/master/notrack-blocklist.txt
|
||||
https://v.firebog.net/hosts/Easyprivacy.txt
|
||||
https://v.firebog.net/hosts/Prigent-Ads.txt
|
||||
https://blocklist.site/app/dl/scam
|
||||
https://blocklist.site/app/dl/proxy
|
||||
https://blocklist.site/app/dl/redirect
|
||||
@@ -1,8 +0,0 @@
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: pi-hole-custom-dnsmasq
|
||||
data:
|
||||
02-custom.conf: |
|
||||
address=/stonegarden.dev/192.168.1.128
|
||||
address=/stonegarden.lan/192.168.1.128
|
||||
@@ -1,9 +0,0 @@
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: pihole-ftl.conf
|
||||
namespace: pi-hole
|
||||
data:
|
||||
pihole-FTL.conf: |
|
||||
MAXDBDAYS=7
|
||||
LOGFILE=/var/log/pihole/pihole-FTL.log
|
||||
@@ -1,16 +0,0 @@
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: regex.list
|
||||
namespace: pi-hole
|
||||
data:
|
||||
regex.list: |
|
||||
(^|\.)googlevideo\.com$
|
||||
(^|\.)twitch\.tv$
|
||||
(^|\.)wuaki\.tv$
|
||||
(^|\.)youtube\.be$
|
||||
(^|\.)youtube\.com$
|
||||
(^|\.)xvpn\.com$
|
||||
(^|\.)xvpn\.io$
|
||||
(^|\.)tiktok\.com$
|
||||
(^|\.)musical\.ly$
|
||||
@@ -1,9 +0,0 @@
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: whitelist.txt
|
||||
namespace: pi-hole
|
||||
data:
|
||||
whitelist.txt: |
|
||||
ichnaea.netflix.com
|
||||
nrdp.nccp.netflix.com
|
||||
10
infra/pi-hole/config/adlists.list
Normal file
10
infra/pi-hole/config/adlists.list
Normal file
@@ -0,0 +1,10 @@
|
||||
https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts
|
||||
https://s3.amazonaws.com/lists.disconnect.me/simple_tracking.txt
|
||||
https://s3.amazonaws.com/lists.disconnect.me/simple_ad.txt
|
||||
https://raw.githubusercontent.com/Perflyst/PiHoleBlocklist/master/SmartTV.txt
|
||||
https://raw.githubusercontent.com/Perflyst/PiHoleBlocklist/master/android-tracking.txt
|
||||
https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/spy.txt
|
||||
https://raw.githubusercontent.com/StevenBlack/hosts/master/data/add.2o7Net/hosts
|
||||
https://gitlab.com/quidsup/notrack-blocklists/raw/master/notrack-blocklist.txt
|
||||
https://v.firebog.net/hosts/Easyprivacy.txt
|
||||
https://v.firebog.net/hosts/Prigent-Ads.txt
|
||||
2
infra/pi-hole/config/pihole-FTL.conf
Normal file
2
infra/pi-hole/config/pihole-FTL.conf
Normal file
@@ -0,0 +1,2 @@
|
||||
MAXDBDAYS=200
|
||||
LOGFILE=/var/log/pihole/pihole-FTL.log
|
||||
2
infra/pi-hole/config/regex.list
Normal file
2
infra/pi-hole/config/regex.list
Normal file
@@ -0,0 +1,2 @@
|
||||
(^|\.)twitch\.tv$
|
||||
(^|\.)youtube\.com$
|
||||
2
infra/pi-hole/config/whitelist.txt
Normal file
2
infra/pi-hole/config/whitelist.txt
Normal file
@@ -0,0 +1,2 @@
|
||||
ichnaea.netflix.com
|
||||
nrdp.nccp.netflix.com
|
||||
@@ -11,10 +11,10 @@ spec:
|
||||
matchLabels:
|
||||
app: pi-hole
|
||||
strategy:
|
||||
type: RollingUpdate
|
||||
rollingUpdate:
|
||||
maxSurge: 1
|
||||
maxUnavailable: 1
|
||||
type: RollingUpdate
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
@@ -55,86 +55,62 @@ spec:
|
||||
limits:
|
||||
cpu: "250m"
|
||||
memory: "896Mi"
|
||||
#readinessProbe:
|
||||
# exec:
|
||||
# command: ['dig', '@127.0.0.1', 'cnn.com']
|
||||
# timeoutSeconds: 20
|
||||
# initialDelaySeconds: 5
|
||||
# periodSeconds: 60
|
||||
#livenessProbe:
|
||||
# tcpSocket:
|
||||
# port: dns-tcp
|
||||
# initialDelaySeconds: 15
|
||||
# periodSeconds: 30
|
||||
livenessProbe:
|
||||
httpGet:
|
||||
path: /admin/index.php
|
||||
port: http
|
||||
scheme: HTTP
|
||||
tcpSocket:
|
||||
port: dns-tcp
|
||||
initialDelaySeconds: 60
|
||||
failureThreshold: 10
|
||||
timeoutSeconds: 5
|
||||
readinessProbe:
|
||||
httpGet:
|
||||
path: /admin/index.php
|
||||
port: http
|
||||
scheme: HTTP
|
||||
exec:
|
||||
command:
|
||||
- 'dig'
|
||||
- '@127.0.0.1'
|
||||
- 'github.com'
|
||||
initialDelaySeconds: 60
|
||||
failureThreshold: 3
|
||||
timeoutSeconds: 5
|
||||
volumeMounts:
|
||||
- name: config
|
||||
mountPath: /etc/pihole
|
||||
- name: custom-dnsmasq
|
||||
mountPath: /etc/dnsmasq.d/02-custom.conf
|
||||
subPath: 02-custom.conf
|
||||
# - name: var-log
|
||||
# mountPath: /var/log
|
||||
# - name: var-log-lighttpd
|
||||
# mountPath: /var/log/lighttpd
|
||||
# - name: ftlconf
|
||||
# mountPath: /etc/pihole/pihole-FTL.conf
|
||||
# subPath: pihole-FTL.conf
|
||||
# - name: regex
|
||||
# mountPath: /etc/pihole/regex.list
|
||||
# subPath: regex.list
|
||||
# - name: whitelist
|
||||
# mountPath: /etc/pihole/whitelist.txt
|
||||
# subPath: whitelist.txt
|
||||
# - name: adlists
|
||||
# mountPath: /etc/pihole/adlists.list
|
||||
# subPath: adlists.list
|
||||
#- name: ftl-conf
|
||||
# mountPath: /etc/pihole/pihole-FTL.conf
|
||||
# subPath: pihole-FTL.conf
|
||||
- name: ad-lists
|
||||
mountPath: /etc/pihole/adlists.list
|
||||
subPath: adlists.list
|
||||
- name: regex
|
||||
mountPath: /etc/pihole/regex.list
|
||||
subPath: regex.list
|
||||
- name: whitelist
|
||||
mountPath: /etc/pihole/whitelist.txt
|
||||
subPath: whitelist.txt
|
||||
restartPolicy: Always
|
||||
volumes:
|
||||
- name: config
|
||||
emptyDir: {}
|
||||
# persistentVolumeClaim:
|
||||
# claimName: pi-hole-config
|
||||
- name: custom-dnsmasq
|
||||
configMap:
|
||||
# defaultMode: 420
|
||||
name: custom-dnsmasq
|
||||
defaultMode: 420
|
||||
#- name: var-log
|
||||
# emptyDir:
|
||||
# medium: Memory
|
||||
#- name: var-log-lighttpd
|
||||
# emptyDir:
|
||||
# medium: Memory
|
||||
#- name: ftlconf
|
||||
#- name: ftl-conf
|
||||
# configMap:
|
||||
# name: pihole-ftl.conf
|
||||
# items:
|
||||
# - key: pihole-FTL.conf
|
||||
# path: pihole-FTL.conf
|
||||
#- name: regex
|
||||
# configMap:
|
||||
# name: regex.list
|
||||
# items:
|
||||
# - key: regex.list
|
||||
# path: regex.list
|
||||
#- name: whitelist
|
||||
# configMap:
|
||||
# name: whitelist.txt
|
||||
# items:
|
||||
# - key: whitelist.txt
|
||||
# path: whitelist.txt
|
||||
#- name: adlists
|
||||
# configMap:
|
||||
# name: adlists.list
|
||||
# items:
|
||||
# - key: adlists.list
|
||||
# path: adlists.list
|
||||
# defaultMode: 420
|
||||
# name: ftl-conf
|
||||
- name: ad-lists
|
||||
configMap:
|
||||
# defaultMode: 420
|
||||
name: adlists.list
|
||||
- name: regex
|
||||
configMap:
|
||||
# defaultMode: 420
|
||||
name: regex.list
|
||||
- name: whitelist
|
||||
configMap:
|
||||
# defaultMode: 420
|
||||
name: whitelist.txt
|
||||
@@ -4,25 +4,32 @@ namespace: pi-hole
|
||||
commonLabels:
|
||||
app: pi-hole
|
||||
|
||||
|
||||
configMapGenerator:
|
||||
- name: pi-hole-env
|
||||
envs:
|
||||
- config/pi-hole-env
|
||||
- name: ftl-conf
|
||||
files:
|
||||
- config/pihole-FTL.conf
|
||||
- name: custom-dnsmasq
|
||||
files:
|
||||
- config/02-custom.conf
|
||||
- name: adlists.list
|
||||
files:
|
||||
- config/adlists.list
|
||||
- name: regex.list
|
||||
files:
|
||||
- config/regex.list
|
||||
- name: whitelist.txt
|
||||
files:
|
||||
- config/whitelist.txt
|
||||
|
||||
resources:
|
||||
- namespace.yaml
|
||||
- auth-secret.yaml
|
||||
- ingress-route.yaml
|
||||
- service.yaml
|
||||
#- cm-dnsmasq.yaml
|
||||
#- cm-adlists.yaml
|
||||
#- cm-ftl.yaml
|
||||
#- cm-regex.yaml
|
||||
#- cm-whitelist.yaml
|
||||
# - pvc.yaml
|
||||
- deployment.yaml
|
||||
|
||||
helmGlobals:
|
||||
|
||||
10
infra/pi-hole/pvc.yaml
Normal file
10
infra/pi-hole/pvc.yaml
Normal file
@@ -0,0 +1,10 @@
|
||||
apiVersion: v1
|
||||
kind: PersistentVolumeClaim
|
||||
metadata:
|
||||
name: pi-hole-config
|
||||
spec:
|
||||
accessModes:
|
||||
- ReadWriteOnce
|
||||
resources:
|
||||
requests:
|
||||
storage: 500Mi
|
||||
Reference in New Issue
Block a user