diff options
| author | makefu <github@syntax-fehler.de> | 2019-10-27 21:43:41 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2019-10-27 21:43:41 +0100 |
| commit | 1a55dc6a2422f7e77ee46c1c04369d73880d446b (patch) | |
| tree | c0621edae7d16ce6bc7f8ef2157384f2690fcd59 /krebs/3modules/external | |
| parent | 9829d8ff9790c194e9acb3b50f2523d389402592 (diff) | |
| parent | f8d1d7f938fcdeb18fc2abb97c586c1cccf6fcf1 (diff) | |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'krebs/3modules/external')
| -rw-r--r-- | krebs/3modules/external/palo.nix | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/krebs/3modules/external/palo.nix b/krebs/3modules/external/palo.nix index 05808714c..aea1792f4 100644 --- a/krebs/3modules/external/palo.nix +++ b/krebs/3modules/external/palo.nix @@ -28,31 +28,30 @@ in { }; }; }; - kruck = { + schasch = { owner = config.krebs.users.palo; nets = { retiolum = { - ip4.addr = "10.243.23.3"; + ip4.addr = "10.243.23.2"; tinc.port = 720; - aliases = [ - "kruck.r" - "video.kruck.r" - ]; + aliases = [ "schasch.r" ]; tinc.pubkey = tinc-for "palo"; }; }; + syncthing.id = "FLY7DHI-TJLEQBJ-JZNC4YV-NBX53Z2-ZBRWADL-BKSFXYZ-L4FMDVH-MOSEVAQ"; }; - schasch = { + sterni = { owner = config.krebs.users.palo; nets = { retiolum = { - ip4.addr = "10.243.23.2"; + ip4.addr = "10.243.23.3"; tinc.port = 720; - aliases = [ "schasch.r" ]; + aliases = [ + "sterni.r" + ]; tinc.pubkey = tinc-for "palo"; }; }; - syncthing.id = "FLY7DHI-TJLEQBJ-JZNC4YV-NBX53Z2-ZBRWADL-BKSFXYZ-L4FMDVH-MOSEVAQ"; }; workhorse = { owner = config.krebs.users.palo; @@ -79,9 +78,7 @@ in { }; users = { palo = { - }; - palo-pepe = { - pubkey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCe3j1dk8o7e0cFn+RepOjdeYcS0YcG0d6NnsMoq8pjqzLRuvOVN4CmsuRo4UJtWOUVv8kIWLcegks2RXbKOSTFAnvEIpPlSmL3BgvFGmUiOmPw1w93yxdVnfd9kJ6SBNuS+kFspKPvOEV9yVpjTywKZ0qKWjRd89Vz2+8aFJ/R3hyE+YqpzlzYbrucEIXbEWESqnzrx61NrWwd1ueHj0RYMDBjIJjVfIIK3W32vQ//pYJio1di0PpOPK2Ya0yugSixymuQBvzCgaedVeLdJ0k1d7d5iVb4LjCR8zg0Jnf1RLfpqRrFYwMJpwuhtIEevfNrhzqZA58QgHO6iOg50FeaD5k1rlWfoOvX2rcV5iqCC9jClIfMKzePdm+MeVorBXp+bflOhyPJG+Qrz6NTE9Ohe5A71Z0bBa96MEoW1hyrLCn0+z+Cx5kt7n2QzAAa/VPNjRDZeHbsu26MrvViEoh+FcPqx4DUIUaDRs/TNIvMGAl14E6gur68AI01a0PZJ/gnqZeOJKuyz4pKT0nIcg0EvkjXM2uEJ9m8h4IBAqTUYMZYm7iJBfpbwT6ePxFfah4q960orBUwW87CyPu/wDGmDblQ7dpkuw+skpzNgOGzerDyGAGKOsjGfYZpqsv9303S2f7884NAIK1ohgpMELytEYpY4YNi2KQYfHhgoQRJ5w== palo@pepe"; + pubkey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC6uza62+Go9sBFs3XZE2OkugBv9PJ7Yv8ebCskE5WYPcahMZIKkQw+zkGI8EGzOPJhQEv2xk+XBf2VOzj0Fto4nh8X5+Llb1nM+YxQPk1SVlwbNAlhh24L1w2vKtBtMy277MF4EP+caGceYP6gki5+DzlPUSdFSAEFFWgN1WPkiyUii15Xi3QuCMR8F18dbwVUYbT11vwNhdiAXWphrQG+yPguALBGR+21JM6fffOln3BhoDUp2poVc5Qe2EBuUbRUV3/fOU4HwWVKZ7KCFvLZBSVFutXCj5HuNWJ5T3RuuxJSmY5lYuFZx9gD+n+DAEJt30iXWcaJlmUqQB5awcB1S2d9pJ141V4vjiCMKUJHIdspFrI23rFNYD9k2ZXDA8VOnQE33BzmgF9xOVh6qr4G0oEpsNqJoKybVTUeSyl4+ifzdQANouvySgLJV/pcqaxX1srSDIUlcM2vDMWAs3ryCa0aAlmAVZIHgRhh6wa+IXW8gIYt+5biPWUuihJ4zGBEwkyVXXf2xsecMWCAGPWPDL0/fBfY9krNfC5M2sqxey2ShFIq+R/wMdaI7yVjUCF2QIUNiIdFbJL6bDrDyHnEXJJN+rAo23jUoTZZRv7Jq3DB/A5H7a73VCcblZyUmwMSlpg3wos7pdw5Ctta3zQPoxoAKGS1uZ+yTeZbPMmdbw=="; }; }; } |