c3d2/nix-config
c3d2
/
nix-config
24
7
Fork 3
Code Issues 12 Pull Requests 2 Releases Wiki Activity

Compare commits

base: c3d2:4177c7245c355ed0059a500c56710b844eb7bf95
Branches Tags
c3d2:master
c3d2:flake-update
c3d2:gitea-actions-runner
c3d2:nixos-23.11
c3d2:ds-future
c3d2:container/radius
...
compare: c3d2:669d737149eced8bbdb990d698e7dbbc59c673d4
Branches Tags
c3d2:flake-update
c3d2:master
c3d2:gitea-actions-runner
c3d2:nixos-23.11
c3d2:ds-future
c3d2:container/radius

5 Commits
4177c7245c ... 669d737149

Author SHA1 Message Date
Astrobot 669d737149 flake.lock: Update 
Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/dea314155a9b8a4de242bdd4c005ba8a5dce8385' (2024-04-23)
  → 'github:nix-community/disko/db1150487c7cde696cf5c4bbb599b37b885ca592' (2024-04-25)
 2024-04-25 10:00:58 +02:00
Astro 42a7892929 flake.lock: Update 
Flake lock file updates:

• Updated input 'buzzrelay':
    'github:astro/buzzrelay/ec65b4bbc0ca88dad750da5880517eb61b4178a4' (2024-04-18)
  → 'github:astro/buzzrelay/c5fddfba89fd2d8dd7f415248a8ed878ffdb1f10' (2024-04-25)
 2024-04-25 02:15:59 +02:00
Sandro - f2f4dc1c22
flake.lock: Update 
Flake lock file updates:

• Updated input 'nixos-modules':
    'github:SuperSandro2000/nixos-modules/3aa5a47abe34f9ea15d4fa2f7cbdc46f68e5c716' (2024-04-24)
  → 'github:SuperSandro2000/nixos-modules/ca1b011888a64355c9a4f675efadb4fd7d2ea9c1' (2024-04-24)
 2024-04-24 23:15:55 +02:00
Sandro - 908826154e
flake.lock: Update 
Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/1efd500e9805a9efbce401ed5999006d397b9f11' (2024-04-18)
  → 'github:nix-community/disko/dea314155a9b8a4de242bdd4c005ba8a5dce8385' (2024-04-23)
• Updated input 'nixos':
    'github:SuperSandro2000/nixpkgs/84f20dcf85434cd2e2a163ec3a30937c78cc26b2' (2024-04-20)
  → 'github:SuperSandro2000/nixpkgs/c6ca8b1e28e3430ad61ec1227936227b1d5f27fc' (2024-04-24)
• Updated input 'nixos-hardware':
    'github:nixos/nixos-hardware/5d48925b815fd202781bfae8fb6f45c07112fdb2' (2024-04-19)
  → 'github:nixos/nixos-hardware/797f8d8082c7cc3259cba7275c699d4991b09ecc' (2024-04-23)
• Updated input 'nixos-modules':
    'github:SuperSandro2000/nixos-modules/4ea537af4d87828138225399c9811b56e04bff6a' (2024-04-14)
  → 'github:SuperSandro2000/nixos-modules/3aa5a47abe34f9ea15d4fa2f7cbdc46f68e5c716' (2024-04-24)
• Updated input 'nixos-unstable':
    'github:SuperSandro2000/nixpkgs/d224d176823a02c7a1f89d473337becb353e50d5' (2024-04-20)
  → 'github:SuperSandro2000/nixpkgs/8f5e30989d498659993a3de2e2747f4bcd930ab1' (2024-04-24)
• Updated input 'openwrt-imagebuilder':
    'github:astro/nix-openwrt-imagebuilder/7ce60a34f86a0a9e35bcc69992de7d79e2ae863a' (2024-04-20)
  → 'github:astro/nix-openwrt-imagebuilder/bf62b9a6a04ccb0a15ba97d12a1a06736a4e8e4e' (2024-04-24)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/5990088d56f0b936fa2633c2a4d76b8d36a01105' (2024-04-14)
  → 'github:oxalica/rust-overlay/606c0ecb23c676c444a0b026eecf800d5bd5fec2' (2024-04-22)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/a929a011a09db735abc45a8a45d1ff7fdee62755' (2024-04-19)
  → 'github:Mic92/sops-nix/f1b0adc27265274e3b0c9b872a8f476a098679bd' (2024-04-23)
• Updated input 'zentralwerk':
    'git+https://gitea.c3d2.de/zentralwerk/network.git?ref=refs/heads/master&rev=54c215c3207858efb2cd349fc71b1a763b9cc467' (2024-04-19)
  → 'git+https://gitea.c3d2.de/zentralwerk/network.git?ref=refs/heads/master&rev=793547d0ca24853d4bbc826894d0fc0510ba07cb' (2024-04-24)
• Added input 'zentralwerk/dns-nix':
    'github:SuperSandro2000/dns.nix/70dcce71560d4253f63812fa36dee994c81ae814' (2023-12-27)
• Added input 'zentralwerk/dns-nix/flake-utils':
    'github:numtide/flake-utils/5466c5bbece17adaab2d82fae80b46e807611bf3' (2021-02-28)
• Added input 'zentralwerk/dns-nix/nixpkgs':
    follows 'zentralwerk/nixpkgs'
 2024-04-24 22:48:39 +02:00
Sandro - e37ba9ef5a
knot: add zentralwerk catalog 2024-04-24 22:38:44 +02:00
2 changed files with 92 additions and 31 deletions
Show Stats Expand all files Collapse all files

100
flake.lock
View File

@ -132,11 +132,11 @@
]
},
"locked": {
"lastModified": 1713401424,
"narHash": "sha256-2o7+8oYV86Kq5FhQARMTzewMdkgIvEV/WJmLgqt2hCM=",
"lastModified": 1714004061,
"narHash": "sha256-gvRG8CkCFxQ3jqdiU+O6s9YdZRTPU53yK7XmEwPO3mk=",
"owner": "astro",
"repo": "buzzrelay",
"rev": "ec65b4bbc0ca88dad750da5880517eb61b4178a4",
"rev": "c5fddfba89fd2d8dd7f415248a8ed878ffdb1f10",
"type": "github"
},
"original": {
@ -225,11 +225,11 @@
]
},
"locked": {
"lastModified": 1713406758,
"narHash": "sha256-kwZvhmx+hSZvjzemKxsAqzEqWmXZS47VVwQhNrINORQ=",
"lastModified": 1714008123,
"narHash": "sha256-zpJNUuOcVL3Yi60VPvpNhs77uIK1D0Ri2eeHcfdz8yg=",
"owner": "nix-community",
"repo": "disko",
"rev": "1efd500e9805a9efbce401ed5999006d397b9f11",
"rev": "db1150487c7cde696cf5c4bbb599b37b885ca592",
"type": "github"
},
"original": {
@ -238,6 +238,28 @@
"type": "github"
}
},
"dns-nix": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": [
"zentralwerk",
"nixpkgs"
]
},
"locked": {
"lastModified": 1703643450,
"narHash": "sha256-EUUF5oxFFPX/etKm0FNQg+7MPHQlNjmM1XhNgyDf7A0=",
"owner": "SuperSandro2000",
"repo": "dns.nix",
"rev": "70dcce71560d4253f63812fa36dee994c81ae814",
"type": "github"
},
"original": {
"owner": "SuperSandro2000",
"repo": "dns.nix",
"type": "github"
}
},
"fenix": {
"inputs": {
"nixpkgs": [
@ -294,6 +316,21 @@
"type": "github"
}
},
"flake-utils_2": {
"locked": {
"lastModified": 1614513358,
"narHash": "sha256-LakhOx3S1dRjnh0b5Dg3mbZyH0ToC9I8Y2wKSkBaTzU=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5466c5bbece17adaab2d82fae80b46e807611bf3",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"heliwatch": {
"inputs": {
"fenix": [
@ -395,11 +432,11 @@
},
"nixos": {
"locked": {
"lastModified": 1713634877,
"narHash": "sha256-+tmLKU8N+YMIIBRPmWFueaytsbSDu4wqGnxc3RKYZwk=",
"lastModified": 1713959385,
"narHash": "sha256-aBsSKMz0H1uMdLnn7/sZ7z9OLPodQMxzpKQy8z2zDrw=",
"owner": "SuperSandro2000",
"repo": "nixpkgs",
"rev": "84f20dcf85434cd2e2a163ec3a30937c78cc26b2",
"rev": "c6ca8b1e28e3430ad61ec1227936227b1d5f27fc",
"type": "github"
},
"original": {
@ -411,11 +448,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1713521961,
"narHash": "sha256-EwR8wW9AqJhSIY+0oxWRybUZ32BVKuZ9bjlRh8SJvQ8=",
"lastModified": 1713864415,
"narHash": "sha256-/BPDMJEkrsFAFOsQWhwm31wezlgshPFlLBn34KEUdVA=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "5d48925b815fd202781bfae8fb6f45c07112fdb2",
"rev": "797f8d8082c7cc3259cba7275c699d4991b09ecc",
"type": "github"
},
"original": {
@ -434,11 +471,11 @@
]
},
"locked": {
"lastModified": 1713133466,
"narHash": "sha256-/MZTIHy7tUdYjDKsZ2ZIVO6u9w9JPTk89rlfqt1YGbc=",
"lastModified": 1713993336,
"narHash": "sha256-x+tkNDUCS9pLytmDPi1jemV4V17ZlXqqFsXbgFLPbcI=",
"owner": "SuperSandro2000",
"repo": "nixos-modules",
"rev": "4ea537af4d87828138225399c9811b56e04bff6a",
"rev": "ca1b011888a64355c9a4f675efadb4fd7d2ea9c1",
"type": "github"
},
"original": {
@ -449,11 +486,11 @@
},
"nixos-unstable": {
"locked": {
"lastModified": 1713624591,
"narHash": "sha256-gWudQexJmgAVzGnUIVzv7sJceAXnf1mz7dTL6zw/KJE=",
"lastModified": 1713963757,
"narHash": "sha256-l7WNMeblSJMVNwAuj9l/2CrBiOquKcCgWSNAvkKngks=",
"owner": "SuperSandro2000",
"repo": "nixpkgs",
"rev": "d224d176823a02c7a1f89d473337becb353e50d5",
"rev": "8f5e30989d498659993a3de2e2747f4bcd930ab1",
"type": "github"
},
"original": {
@ -534,11 +571,11 @@
]
},
"locked": {
"lastModified": 1713607966,
"narHash": "sha256-8IfaENkpsGee7ZPPx/JmjX54gTMOs4z5C+8vFu/KyyI=",
"lastModified": 1713955338,
"narHash": "sha256-V9DfgUeFttkXrzzWCm2FxEpKZW0EliPVOdFnLD6GEm4=",
"owner": "astro",
"repo": "nix-openwrt-imagebuilder",
"rev": "7ce60a34f86a0a9e35bcc69992de7d79e2ae863a",
"rev": "bf62b9a6a04ccb0a15ba97d12a1a06736a4e8e4e",
"type": "github"
},
"original": {
@ -612,11 +649,11 @@
]
},
"locked": {
"lastModified": 1713062877,
"narHash": "sha256-msvDk9+qkD4jvMf63PieGRy+hHk0VIKruivHM1BmCM8=",
"lastModified": 1713752081,
"narHash": "sha256-x0QDETp7paa8qq+LX6191JwSq8abUFXCnKNulQ8L7ps=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "5990088d56f0b936fa2633c2a4d76b8d36a01105",
"rev": "606c0ecb23c676c444a0b026eecf800d5bd5fec2",
"type": "github"
},
"original": {
@ -704,11 +741,11 @@
]
},
"locked": {
"lastModified": 1713532771,
"narHash": "sha256-vfKxhYVMzG2tg48/1rewBoSLCrKIjQsG1j7Nm/Y2gf4=",
"lastModified": 1713892811,
"narHash": "sha256-uIGmA2xq41vVFETCF1WW4fFWFT2tqBln+aXnWrvjGRE=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "a929a011a09db735abc45a8a45d1ff7fdee62755",
"rev": "f1b0adc27265274e3b0c9b872a8f476a098679bd",
"type": "github"
},
"original": {
@ -902,6 +939,7 @@
},
"zentralwerk": {
"inputs": {
"dns-nix": "dns-nix",
"nixpkgs": [
"nixos"
],
@ -913,11 +951,11 @@
]
},
"locked": {
"lastModified": 1713517574,
"narHash": "sha256-4+HSGz9Rq5UorDrkp78P8O9NZIxfcs4FOQyPY6bXJko=",
"lastModified": 1713988692,
"narHash": "sha256-/3oqQpTC2rbMjXUksSj5RIvos/XiycgWWgKIpNZEFTc=",
"ref": "refs/heads/master",
"rev": "54c215c3207858efb2cd349fc71b1a763b9cc467",
"revCount": 2007,
"rev": "793547d0ca24853d4bbc826894d0fc0510ba07cb",
"revCount": 2019,
"type": "git",
"url": "https://gitea.c3d2.de/zentralwerk/network.git"
},

23
hosts/knot/default.nix
View File

@ -68,6 +68,11 @@
];
action = "transfer";
}
{
id = "dns.serv.zentralwerk.org_notify";
address = [ /*"172.20.73.2"*/ "2a00:8180:2c00:282:2::2" ];
action = "notify";
}
];
log = [ {
@ -92,6 +97,10 @@
{
id = "ns1.supersandro.de";
address = [ "188.34.196.104" "2a01:4f8:1c1c:1d38::1" ];
} {
id = "dns.serv.zentralwerk.org";
# IPv4 doesn't work because of nat
address = [ /*"172.20.73.2"*/ "2a00:8180:2c00:282:2::2" ];
}
];
@ -142,6 +151,12 @@
storage = "/var/lib/knot/zones";
zonefile-load = "difference-no-serial";
}
{
id = "zentralwerk_template";
acl = "dns.serv.zentralwerk.org_notify";
master = "dns.serv.zentralwerk.org";
storage = "/var/lib/knot/catalog/zentralwerk";
}
];
zone = [
@ -152,6 +167,14 @@
notify = [ "ns1.supersandro.de" ];
storage = "/var/lib/knot/catalog";
}
{
acl = "dns.serv.zentralwerk.org_notify";
catalog-role = "interpret";
catalog-template = "zentralwerk_template";
domain = "zentralwerk.";
master = "dns.serv.zentralwerk.org";
storage = "/var/lib/knot/catalog";
}
] ++ map ({ acl ? [], notify ? [], ... }@zone: {
inherit (zone) domain;
template = "c3d2";