Noratrieb/vps
1
0
Fork 0
mirror of https://github.com/Noratrieb/vps.git synced 2026-01-14 16:55:00 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Lower TTLs to 1h

Browse source
This commit is contained in:
nora 2024-07-27 12:44:34 +02:00
parent 63163a38d0
commit ea74393dcd
3 changed files with 23 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
newinfra/nix/modules/dns/default.nix
View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { { pkgs, lib, ... }: {
# get the package for the debugging tools # get the package for the debugging tools
environment.systemPackages = with pkgs; [ knot-dns ]; environment.systemPackages = with pkgs; [ knot-dns ];
@ -29,10 +29,10 @@
zone: zone:
- domain: noratrieb.dev - domain: noratrieb.dev
storage: /var/lib/knot/zones/ storage: /var/lib/knot/zones/
file: ${import ./noratrieb.dev.nix { inherit pkgs; }} file: ${import ./noratrieb.dev.nix { inherit pkgs; inherit lib; }}
- domain: nilstrieb.dev - domain: nilstrieb.dev
storage: /var/lib/knot/zones/ storage: /var/lib/knot/zones/
file: ${import ./nilstrieb.dev.nix { inherit pkgs; }} file: ${import ./nilstrieb.dev.nix { inherit pkgs; inherit lib; }}
log: log:
- target: syslog - target: syslog
any: info any: info

20
newinfra/nix/modules/dns/nilstrieb.dev.nix
View file

@ -1,13 +1,17 @@
# https://github.com/nix-community/dns.nix # https://github.com/nix-community/dns.nix
{ pkgs, ... }: { pkgs, lib, ... }:
let let
data = with pkgs.nix-dns.lib.combinators; data = with pkgs.nix-dns.lib.combinators;
let let
dns1 = host "154.38.163.74" null; hour1 = 3600;
dns2 = host "128.140.3.7" "2a01:4f8:c2c:d616::"; normalHost = ipv4: ipv6:
lib.optionalAttrs (ipv4 != null) { A = [ (ttl hour1 (a ipv4)) ]; } //
lib.optionalAttrs (ipv6 != null) { AAAA = [ (ttl hour1 (aaaa ipv6)) ]; };
dns1 = normalHost "154.38.163.74" null;
dns2 = normalHost "128.140.3.7" "2a01:4f8:c2c:d616::";
vps1 = host "161.97.165.1" null; vps1 = normalHost "161.97.165.1" null;
vps2 = host "184.174.32.252" null; vps2 = normalHost "184.174.32.252" null;
in in
{ {
SOA = { SOA = {
@ -26,14 +30,14 @@ let
"ns2.nilstrieb.dev" "ns2.nilstrieb.dev"
]; ];
A = [ A = map (ttl hour1) [
# GH Pages # GH Pages
(a "185.199.108.153") (a "185.199.108.153")
(a "185.199.109.153") (a "185.199.109.153")
(a "185.199.110.153") (a "185.199.110.153")
(a "185.199.111.153") (a "185.199.111.153")
]; ];
AAAA = [ AAAA = map (ttl hour1) [
# GH Pages # GH Pages
(aaaa "2606:50c0:8002:0:0:0:0:153") (aaaa "2606:50c0:8002:0:0:0:0:153")
(aaaa "2606:50c0:8003:0:0:0:0:153") (aaaa "2606:50c0:8003:0:0:0:0:153")
@ -48,7 +52,7 @@ let
subdomains = { subdomains = {
www = vps2; www = vps2;
blog.CNAME = [ (cname "nilstrieb.github.io") ]; blog.CNAME = map (ttl hour1) [ (cname "nilstrieb.github.io") ];
# apps # apps
bisect-rustc = vps2; bisect-rustc = vps2;

12
newinfra/nix/modules/dns/noratrieb.dev.nix
View file

@ -1,12 +1,16 @@
# https://github.com/nix-community/dns.nix # https://github.com/nix-community/dns.nix
{ pkgs, ... }: { pkgs, lib, ... }:
let let
data = with pkgs.nix-dns.lib.combinators; data = with pkgs.nix-dns.lib.combinators;
let let
dns1 = host "154.38.163.74" null; hour1 = 3600;
dns2 = host "128.140.3.7" "2a01:4f8:c2c:d616::"; normalHost = ipv4: ipv6:
lib.optionalAttrs (ipv4 != null) { A = [ (ttl hour1 (a ipv4)) ]; } //
lib.optionalAttrs (ipv6 != null) { AAAA = [ (ttl hour1 (aaaa ipv6)) ]; };
dns1 = normalHost "154.38.163.74" null;
dns2 = normalHost "128.140.3.7" "2a01:4f8:c2c:d616::";
vps1 = host "161.97.165.1" null; vps1 = normalHost "161.97.165.1" null;
in in
# vps1 contains root noratrieb.dev # vps1 contains root noratrieb.dev
vps1 // { vps1 // {