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

Compare commits

base: c3d2:f2a0d8b4745658f6fc556f33dd0f8713680b8c55
Branches Tags
c3d2:master
c3d2:flake-update
c3d2:gitea-actions-runner
c3d2:nixos-23.11
c3d2:ds-future
c3d2:container/radius
...
compare: c3d2:b88bd2ab0793f823cd73c68618bc785d2056b83d
Branches Tags
c3d2:flake-update
c3d2:master
c3d2:gitea-actions-runner
c3d2:nixos-23.11
c3d2:ds-future
c3d2:container/radius

5 Commits
f2a0d8b474 ... b88bd2ab07

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

• Updated input 'disko':
    'github:nix-community/disko/0a17298c0d96190ef3be729d594ba202b9c53beb' (2024-04-05)
  → 'github:nix-community/disko/79eab0e82cb126bf4ac170f44af82479f0895ab5' (2024-04-08)
• Updated input 'microvm':
    'github:astro/microvm.nix/1e746a8987eb893adc8dd317b84e73d72803b650' (2024-04-06)
  → 'github:astro/microvm.nix/145806cba712130579e8990d4230d0d71cb38777' (2024-04-08)
• Updated input 'nixos-unstable':
    'github:SuperSandro2000/nixpkgs/de0499eb0849d85bf04f7b3cc3a48bf00941a867' (2024-04-07)
  → 'github:SuperSandro2000/nixpkgs/73aab81c382cd3cd7e0536867ebf11795c265555' (2024-04-08)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/39191e8e6265b106c9a2ba0cfd3a4dafe98a31c6' (2024-04-07)
  → 'github:Mic92/sops-nix/538c114cfdf1f0458f507087b1dcf018ce1c0c4c' (2024-04-08)
 2024-04-09 10:00:43 +02:00
Sandro - 19e1bfb583
knot: fix typo 2024-04-08 13:55:34 +02:00
Sandro - a7fb189003
flake.lock: Update 
Flake lock file updates:

• Updated input 'nixos':
    'github:SuperSandro2000/nixpkgs/29065c5ccd35f07b3cfda8c35e38160c4e126ecf' (2024-04-07)
  → 'github:SuperSandro2000/nixpkgs/1bb6d38faeece5f7e0bf01519289a5f7fa0a56f9' (2024-04-07)
• Updated input 'nixos-hardware':
    'github:nixos/nixos-hardware/f3b959627bca46a9f7052b8fbc464b8323e68c2c' (2024-04-05)
  → 'github:nixos/nixos-hardware/1e3b3a35b7083f4152f5a516798cf9b21e686465' (2024-04-08)
• Updated input 'nixos-unstable':
    'github:SuperSandro2000/nixpkgs/af46a3f65bc295853bedaf9c86034a5d230e58fb' (2024-04-07)
  → 'github:SuperSandro2000/nixpkgs/de0499eb0849d85bf04f7b3cc3a48bf00941a867' (2024-04-07)
• Updated input 'openwrt-imagebuilder':
    'github:astro/nix-openwrt-imagebuilder/bd06df97cbaa7f67a4b845169ad68d12a1062666' (2024-04-07)
  → 'github:astro/nix-openwrt-imagebuilder/fde22e2a669d3262a23753a2e4c7eec3cf7f566d' (2024-04-08)
• Updated input 'zentralwerk':
    'git+https://gitea.c3d2.de/zentralwerk/network.git?ref=refs/heads/master&rev=22a4fb5c3937665d4e287a4db5c5867dd67525a4' (2024-04-03)
  → 'git+https://gitea.c3d2.de/zentralwerk/network.git?ref=refs/heads/master&rev=cb616b8b8891d320058526982d47fbd903eeb79b' (2024-04-08)
 2024-04-08 13:53:22 +02:00
Sandro - 3a28d2563e
knot: notify q-ix.net less 2024-04-08 13:51:38 +02:00
Sandro - bde9387e9c
knot: drop inwx 2024-04-08 13:51:06 +02:00
2 changed files with 41 additions and 37 deletions
Show Stats Expand all files Collapse all files

50
flake.lock
View File

@ -209,11 +209,11 @@
]
},
"locked": {
"lastModified": 1712356478,
"narHash": "sha256-kTcEtrQIRnexu5lAbLsmUcfR2CrmsACF1s3ZFw1NEVA=",
"lastModified": 1712612224,
"narHash": "sha256-Tv4C8OSPVmm4LbpJGLFSODyvJy6DqrisEGPCQdNVOeY=",
"owner": "nix-community",
"repo": "disko",
"rev": "0a17298c0d96190ef3be729d594ba202b9c53beb",
"rev": "79eab0e82cb126bf4ac170f44af82479f0895ab5",
"type": "github"
},
"original": {
@ -302,11 +302,11 @@
"spectrum": "spectrum"
},
"locked": {
"lastModified": 1712366957,
"narHash": "sha256-7W3D1Gk6mGlwtV07n6YB/7s3tThcBYknlvDPcoJJSe4=",
"lastModified": 1712587479,
"narHash": "sha256-yVeJGCtOGKSA4o088NpRk4gvoCthQVLCNeehCI1KS5w=",
"owner": "astro",
"repo": "microvm.nix",
"rev": "1e746a8987eb893adc8dd317b84e73d72803b650",
"rev": "145806cba712130579e8990d4230d0d71cb38777",
"type": "github"
},
"original": {
@ -363,11 +363,11 @@
},
"nixos": {
"locked": {
"lastModified": 1712509734,
"narHash": "sha256-VcXxj2zH0w6a+N573KnDU7sOazzuvE1S+P3GH6Bt//A=",
"lastModified": 1712510303,
"narHash": "sha256-IZvFSWgMM+TiVGpi7Z9rUxcVSKG+NoyL5oP6WOUp1lk=",
"owner": "SuperSandro2000",
"repo": "nixpkgs",
"rev": "29065c5ccd35f07b3cfda8c35e38160c4e126ecf",
"rev": "1bb6d38faeece5f7e0bf01519289a5f7fa0a56f9",
"type": "github"
},
"original": {
@ -379,11 +379,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1712324865,
"narHash": "sha256-+BatEWd4HlMeK7Ora+gYIkarjxFVCg9oKrIeybHIIX4=",
"lastModified": 1712566108,
"narHash": "sha256-c9nT2ZODGqobISP41kUwCQ84Srwg7a/1TmPFQuol2/8=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "f3b959627bca46a9f7052b8fbc464b8323e68c2c",
"rev": "1e3b3a35b7083f4152f5a516798cf9b21e686465",
"type": "github"
},
"original": {
@ -417,11 +417,11 @@
},
"nixos-unstable": {
"locked": {
"lastModified": 1712509680,
"narHash": "sha256-BG3lO4OBlKtAkpquYBA1pvbIhLPu8hBxtaT3q5Ck/4Y=",
"lastModified": 1712581547,
"narHash": "sha256-GlUV6u1+0edP8a0mrZXI6oNrc8IFWSAxNe5bTW2KND4=",
"owner": "SuperSandro2000",
"repo": "nixpkgs",
"rev": "af46a3f65bc295853bedaf9c86034a5d230e58fb",
"rev": "73aab81c382cd3cd7e0536867ebf11795c265555",
"type": "github"
},
"original": {
@ -472,11 +472,11 @@
]
},
"locked": {
"lastModified": 1712482194,
"narHash": "sha256-Prv3YedWEPpc3iIaw7/P7iKPwfqqogQx1l4WW46RiIA=",
"lastModified": 1712571708,
"narHash": "sha256-IZ1EwUM0fPNGOlB3KGENTwE+q6YyZ+aRghXudE86Yco=",
"owner": "astro",
"repo": "nix-openwrt-imagebuilder",
"rev": "bd06df97cbaa7f67a4b845169ad68d12a1062666",
"rev": "fde22e2a669d3262a23753a2e4c7eec3cf7f566d",
"type": "github"
},
"original": {
@ -631,11 +631,11 @@
]
},
"locked": {
"lastModified": 1712458908,
"narHash": "sha256-DMgBS+jNHDg8z3g9GkwqL8xTKXCRQ/0FGsAyrniVonc=",
"lastModified": 1712617241,
"narHash": "sha256-a4hbls4vlLRMciv62YrYT/Xs/3Cubce8WFHPUDWwzf8=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "39191e8e6265b106c9a2ba0cfd3a4dafe98a31c6",
"rev": "538c114cfdf1f0458f507087b1dcf018ce1c0c4c",
"type": "github"
},
"original": {
@ -825,11 +825,11 @@
]
},
"locked": {
"lastModified": 1712170393,
"narHash": "sha256-QvG/OJXoMxtwV3L9J/utzrx3FWAQaR2i1NQME97/DpE=",
"lastModified": 1712576876,
"narHash": "sha256-kTkQffyPgnteBzj4xx2zYdegcamTyGLKHW7VhKeameQ=",
"ref": "refs/heads/master",
"rev": "22a4fb5c3937665d4e287a4db5c5867dd67525a4",
"revCount": 1969,
"rev": "cb616b8b8891d320058526982d47fbd903eeb79b",
"revCount": 1970,
"type": "git",
"url": "https://gitea.c3d2.de/zentralwerk/network.git"
},

28
hosts/knot/default.nix
View File

@ -49,9 +49,6 @@
{
id = "axfr";
address = [
# INWX
# TODO: drop when c3d2.social migrated off
"2a0a:c980::53/128"
# Inbert
"2001:67c:1400:2240::1/128"
# dns.serv.zentralwerk.org
@ -98,10 +95,17 @@
}
];
remotes = [ {
id = "all";
remote = [ "ns.spaceboyz.net" "ns0.q-ix.net" "ns1.supersandro.de" ];
} ];
remotes = [
{
id = "all";
remote = [ "ns.spaceboyz.net" "ns1.supersandro.de" ];
}
{
# TODO: drop
id = "q-ix";
remote = [ "ns0.q-ix.net" ];
}
];
server = {
answer-rotation = true;
@ -148,13 +152,13 @@
notify = [ "ns1.supersandro.de" ];
storage = "/var/lib/knot/catalog";
}
] ++ map ({ acl ? [], ... }@zone: {
] ++ map ({ acl ? [], notify ? [], ... }@zone: {
inherit (zone) domain;
template = "c3d2";
notify = [ "all" ];
notify = [ "all" ] ++ notify;
acl = [ "axfr" "zone_xfr" ] ++ acl;
}) [
{ domain = "c3dd.de"; }
{ domain = "c3dd.de"; notify = [ "q-ix" ]; }
{ domain = "c3d2.de"; acl = [ "jabber" ]; }
{ domain = "hq.c3d2.de"; }
{ domain = "dyn.hq.c3d2.de"; }
@ -163,11 +167,11 @@
{ domain = "c3d2.ffdd"; }
{ domain = "c3d2.space"; }
{ domain = "c3d2.social"; }
{ domain = "cccdd.de"; }
{ domain = "cccdd.de"; notify = [ "q-ix" ]; }
{ domain = "dresden.ccc.de"; }
{ domain = "datenspuren.de"; }
{ domain = "netzbiotop.org"; }
{ domain = "pentamedia.org"; }
{ domain = "pentamedia.org"; notify = [ "q-ix" ]; }
{ domain = "zentralwerk.ffdd"; }
{ domain = "2001-67c-1400-2240.ip6.arpa"; }