Compare commits
1 Commits
d90f9fb648
...
3f444a392d
Author | SHA1 | Date |
---|---|---|
coolneng | 3f444a392d |
|
@ -51,11 +51,13 @@ in {
|
||||||
5000 # Sybase
|
5000 # Sybase
|
||||||
80 # HTTP
|
80 # HTTP
|
||||||
443 # HTTPS
|
443 # HTTPS
|
||||||
|
53 # DNS
|
||||||
];
|
];
|
||||||
allowedUDPPorts = [
|
allowedUDPPorts = [
|
||||||
137 # Samba
|
137 # Samba
|
||||||
138 # Samba
|
138 # Samba
|
||||||
1194 # Wireguard
|
1194 # Wireguard
|
||||||
|
53 # DNS
|
||||||
];
|
];
|
||||||
allowPing = true;
|
allowPing = true;
|
||||||
};
|
};
|
||||||
|
@ -130,4 +132,25 @@ in {
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# DNS server with adblock
|
||||||
|
services.dnsmasq = {
|
||||||
|
enable = true;
|
||||||
|
servers = [ "1.1.1.1" "8.8.8.8" ];
|
||||||
|
extraConfig = ''
|
||||||
|
domain-needed
|
||||||
|
bogus-priv
|
||||||
|
no-resolv
|
||||||
|
|
||||||
|
listen-address=127.0.0.1,10.0.1.3,10.9.0.1
|
||||||
|
bind-interfaces
|
||||||
|
|
||||||
|
cache-size=10000
|
||||||
|
local-ttl=300
|
||||||
|
|
||||||
|
conf-file=/var/lib/dnsmasq/dnsmasq.blacklist.txt
|
||||||
|
|
||||||
|
address=/coace.duckdns.org/10.0.1.3
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,10 @@
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
{
|
let
|
||||||
|
stateDir = "/var/lib/dnsmasq";
|
||||||
|
blocklist = "${stateDir}/dnsmasq.blacklist.txt";
|
||||||
|
|
||||||
|
in {
|
||||||
# Pull changes from git repos
|
# Pull changes from git repos
|
||||||
systemd.user.services.git-pull = {
|
systemd.user.services.git-pull = {
|
||||||
description = "Pull git repositories";
|
description = "Pull git repositories";
|
||||||
|
@ -14,7 +18,7 @@
|
||||||
serviceConfig = { Type = "oneshot"; };
|
serviceConfig = { Type = "oneshot"; };
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.user.timers.doom-upgrade = {
|
systemd.user.timers.git-pull = {
|
||||||
description = "Daily code update";
|
description = "Daily code update";
|
||||||
wantedBy = [ "default.target" ];
|
wantedBy = [ "default.target" ];
|
||||||
timerConfig = {
|
timerConfig = {
|
||||||
|
@ -30,4 +34,27 @@
|
||||||
location = "/vault/backups/databases/nextcloud";
|
location = "/vault/backups/databases/nextcloud";
|
||||||
startAt = "*-*-* 05:15:00";
|
startAt = "*-*-* 05:15:00";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Fetch hosts-blocklists daily
|
||||||
|
systemd.services.download-dns-blocklist = {
|
||||||
|
description = "Download hosts-blocklists";
|
||||||
|
wantedBy = [ "default.target" ];
|
||||||
|
path = with pkgs; [ curl ];
|
||||||
|
script =
|
||||||
|
"curl -L https://github.com/notracking/hosts-blocklists/raw/master/dnsmasq/dnsmasq.blacklist.txt -o ${blocklist}";
|
||||||
|
serviceConfig.Type = "oneshot";
|
||||||
|
postStop = ''
|
||||||
|
chown -R dnsmasq ${stateDir}
|
||||||
|
systemctl restart dnsmasq
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
systemd.timers.download-dns-blocklist = {
|
||||||
|
description = "Daily download of hosts-blocklists";
|
||||||
|
wantedBy = [ "default.target" ];
|
||||||
|
timerConfig = {
|
||||||
|
OnCalendar = "02:00:00";
|
||||||
|
Unit = "download-dns-blocklist.service";
|
||||||
|
};
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue