diff options
| author | tv <tv@krebsco.de> | 2022-12-06 01:33:28 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2022-12-06 01:33:28 +0100 |
| commit | 2f17a36ab546bc1271649ce03504a6d4db0738e9 (patch) | |
| tree | 973b884a257bd336db954a709996e2fe3ca24503 /kartei | |
| parent | 426d6e2e5cdbe52cf776400cec85036f4cb86b79 (diff) | |
| parent | 645c3564f75589531abcf17fd3c3f920d93a394a (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'kartei')
| -rw-r--r-- | kartei/kmein/default.nix | 22 | ||||
| -rw-r--r-- | kartei/lass/default.nix | 11 |
2 files changed, 28 insertions, 5 deletions
diff --git a/kartei/kmein/default.nix b/kartei/kmein/default.nix index 8e9e108e6..39125e35c 100644 --- a/kartei/kmein/default.nix +++ b/kartei/kmein/default.nix @@ -138,6 +138,28 @@ in wireguard.pubkey = "09yVPHL/ucvqc6V5n7vFQ2Oi1LBMdwQZDL+7jBwy+iQ="; }; }; + tabula = { + nets.retiolum = { + ip4.addr = "10.243.2.78"; + aliases = [ "tabula.r" "tabula.kmein.r" ]; + tinc.pubkey = '' + -----BEGIN RSA PUBLIC KEY----- + MIICCgKCAgEA4cdFDoKRA9t+r686w6gH1u4UjEQJBmhsf3tkPEkv7nyVr4ahcZQk + rQwlhNRJwv0wekwO0qG19VoAmBkVMzYu5JWn9WeYfIEUtP3ndPa7tqWQ4qIkYh8q + 4KQ03Y3CZav5ClK9rLO7gj+dsP+BhVdqhte4pJANs4CyglYkyu6p0P4+R2P0tfcq + LTl8RB+SXuafqzhoQD+yhhA1HR8O1o9gHJjKiEVrSLwSFfD8WWH55yeWzIYAbuv8 + 8a5VzhS5zvDYUFTP1WUPTeGlKsJdslSZqsrZmBDpkh1iEpRzQUnwQNMJ/uGXIldE + 3FKKoL9LKlvr1Iz9IcuxO4QLk+DoC8+Jc7yQrwIiQQCwAfwdyY6KcRDAqna1WZRd + MFRvPd6y1BmLVJMG43VpWm5POE9Gw5nj5IzSNAFshoNljf246y2+wf8EtULqtrJD + DMckquiYRnzQPco9PgjLfH/6SnlB/oXhvT4+rB4KceSoFKOLWq1pFogDGDy0xyB0 + ufkPsXiYE2KRnkozDJWlKSqrkM3GSR2lTM5cAmLh8VzxkI6LeJu8/6qxFa6J6tn4 + +kH8yjbcLqjmuUykfOZ2eL4GniaFexDvZcGgLD1I5f1ylEmSuU6boyx83WkCH7NH + 1cmaBDQsy4x0gMUYlLDVDW7X2PECoq5mQ61FHBNkdNOujOM/JPnYf4UCAwEAAQ== + -----END RSA PUBLIC KEY----- + ''; + tinc.pubkey_ed25519 = "eZsnMScJdH5k/W3Y5fILnz5Kc01R+dRzjjE/cnu96VF"; + }; + }; tahina = { nets.retiolum = { ip4.addr = "10.243.2.74"; diff --git a/kartei/lass/default.nix b/kartei/lass/default.nix index c995d8b8c..e17e000dd 100644 --- a/kartei/lass/default.nix +++ b/kartei/lass/default.nix @@ -59,11 +59,12 @@ in { cores = 4; extraZones = { "krebsco.de" = '' - cache IN A ${nets.internet.ip4.addr} - p IN A ${nets.internet.ip4.addr} - c IN A ${nets.internet.ip4.addr} - paste IN A ${nets.internet.ip4.addr} - prism IN A ${nets.internet.ip4.addr} + cache 60 IN A ${nets.internet.ip4.addr} + p 60 IN A ${nets.internet.ip4.addr} + c 60 IN A ${nets.internet.ip4.addr} + paste 60 IN A ${nets.internet.ip4.addr} + prism 60 IN A ${nets.internet.ip4.addr} + social 60 IN A ${nets.internet.ip4.addr} ''; "lassul.us" = '' $TTL 3600 |