diff options
| author | lassulus <git@lassul.us> | 2023-06-19 03:25:39 +0200 |
|---|---|---|
| committer | lassulus <git@lassul.us> | 2023-06-19 03:25:39 +0200 |
| commit | 139799c53cdaf55c362109e01be9dd96cc8700ed (patch) | |
| tree | b1ce719ec8f62458bce2d9fe2191b8d004630f2a /kartei | |
| parent | cb8fbb09127392a17d698d91f78ede7ae46accb8 (diff) | |
| parent | a766e88e7c8d87aa6bdbde796d3a454f7b5e546e (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'kartei')
| -rw-r--r-- | kartei/makefu/default.nix | 10 | ||||
| -rw-r--r-- | kartei/makefu/retiolum/snake_ed25519.pub | 2 | ||||
| -rw-r--r-- | kartei/makefu/wiregrill/omo.pub | 1 |
3 files changed, 11 insertions, 2 deletions
diff --git a/kartei/makefu/default.nix b/kartei/makefu/default.nix index 5e236d574..f98521e25 100644 --- a/kartei/makefu/default.nix +++ b/kartei/makefu/default.nix @@ -104,7 +104,8 @@ in { nets = { retiolum.ip4.addr = "10.243.0.91"; wiregrill = { - # defaults + ip4.addr = "10.243.245.6"; + aliases = [ "x.w" ]; }; }; @@ -120,6 +121,12 @@ in { ci = true; syncthing.id = "Y5OTK3S-JOJLAUU-KTBXKUW-M7S5UEQ-MMQPUK2-7CXO5V6-NOUDLKP-PRGAFAK"; nets = { + wiregrill = { + aliases = ["omo.w" "hass.omo.w" "jelly.omo.w" "jelly.makefu.w" ]; + ip6.addr = (krebs.genipv6 "wiregrill" "makefu" { hostName = "omo"; }).address; + ip4.addr = "10.244.245.5"; + + }; retiolum = { ip4.addr = "10.243.0.89"; aliases = [ @@ -239,6 +246,7 @@ in { play.work.euer IN A ${nets.internet.ip4.addr} ul.work.euer IN A ${nets.internet.ip4.addr} music.euer IN A ${nets.internet.ip4.addr} + ntfy.euer IN A ${nets.internet.ip4.addr} ''; }; nets = rec { diff --git a/kartei/makefu/retiolum/snake_ed25519.pub b/kartei/makefu/retiolum/snake_ed25519.pub index a7f9f749b..43e9d2c49 100644 --- a/kartei/makefu/retiolum/snake_ed25519.pub +++ b/kartei/makefu/retiolum/snake_ed25519.pub @@ -1 +1 @@ -Ed25519PublicKey = lKMWnuEVjcSoSEUWrj+51pwDQrQj2TqloL3aBKVWBbO +lKMWnuEVjcSoSEUWrj+51pwDQrQj2TqloL3aBKVWBbO diff --git a/kartei/makefu/wiregrill/omo.pub b/kartei/makefu/wiregrill/omo.pub new file mode 100644 index 000000000..bb6b8811b --- /dev/null +++ b/kartei/makefu/wiregrill/omo.pub @@ -0,0 +1 @@ +JmcpzkwgKymVecZqaV0ODQactoVwGGlEHcfYIOCkx3A= |