diff options
| -rw-r--r-- | kartei/rtunreal/default.nix | 35 | ||||
| -rw-r--r-- | kartei/rtunreal/ssh/rtunreal.runner.pub | 1 | ||||
| -rw-r--r-- | kartei/rtunreal/ssh/rtunreal.spinner.pub | 1 | ||||
| -rw-r--r-- | krebs/3modules/krebs-pages.nix | 1 | ||||
| -rw-r--r-- | krebs/nixpkgs.json | 8 |
5 files changed, 38 insertions, 8 deletions
diff --git a/kartei/rtunreal/default.nix b/kartei/rtunreal/default.nix index 5f00e3d45..faa593c63 100644 --- a/kartei/rtunreal/default.nix +++ b/kartei/rtunreal/default.nix @@ -15,13 +15,18 @@ let ip6.addr = (krebs.genipv6 "wiregrill" "external" { inherit hostName; }).address; }; }); + ssh-for = name: builtins.readFile (./ssh + "/${name}.pub"); in { users = rec { - rtunreal = { - # Mail is temporary as it will change in the future and I - # don't want it to be semi permanent - # mail: krebscotemp(a)user-sites[point]de + rtunreal = rtunreal-spinner; + rtunreal-spinner = { + mail = "unreal@rtinf.net"; + pubkey = ssh-for "rtunreal.spinner"; + }; + rtunreal-runner = { + inherit (rtunreal-spinner) mail; + pubkey = ssh-for "rtunreal.runner"; }; }; hosts = mapAttrs hostDefaults { @@ -47,5 +52,27 @@ in tinc.pubkey_ed25519 = "eHWJxlhbUQY0rT2PLqbqb9W4hf7zHh3+gEIRaGrxAdB"; }; }; + rtrunner = { + nets.retiolum = { + aliases = [ "runner.rtunreal.r" ]; + ip4.addr = "10.243.20.22"; + tinc.pubkey = '' + -----BEGIN RSA PUBLIC KEY----- + MIICCgKCAgEAwWSzslk21TbghFsEWk+A0FobqgxrYyyimzSw772OhIpDmCLd63Vr + x1A/ytEObngMgv/YDTZrp23uFo9uFipAIZPBFBPDPi3fa8OuaGY6MFP6961Ui30l + 4cHBfhuokfdDZxaARwsUtk3RgvFjQvF//Wgj6MIMg3lBMxr00/U3bhegkhP2NyT6 + NCB9xbM6iJQyzOum49u0NHXUEkDzpHWm85CcyV4UTv+MQEnXU4l2irYFu+ArTPEn + dHqbKBd8lPuLTH1ehiOTh85qC/KV36jHWwmguR96aVEplrFMgV43VnpJj5jLa1NQ + n00JiCkCVf89LkAz4ZXtQ+5cvDRSWQGYql+J3KJ28YynLPOIlVlEJ+HjhaSQT/3O + qiREOjp2KPpnSoY5561J2LfmL+shpsVzyFxO+2P0K2bE5K66LfTfmoLUiHKq4/SR + 8EPBZfwvMyWbL3vxngFhZKI01LMsf0YJxu9FWCOPa2X6B7JAxr1jMn0Uzw3ZvNnq + q6QK/sJhuM1/ddmCMofKYeOtfdunnboniFzI2QValuIdmlOi7nYNqy+gSrxRSWnJ + PTzGoJB9R4/PufSGJxUr7FCRxSY/TN7fJF74YVG9iVz2ttEuwdUI3ORQVrORbpEI + wEtM64cb0Dt2WyB3Sit8UGtK59BPYJcU7PB+tMnNLynPzFdkj8gDZtsCAwEAAQ== + -----END RSA PUBLIC KEY----- + ''; + tinc.pubkey_ed25519 = "YJE4KD9PhDjxucDAGrbec5Yqqf3A8/VU0J0NV8EPXuN"; + }; + }; }; } diff --git a/kartei/rtunreal/ssh/rtunreal.runner.pub b/kartei/rtunreal/ssh/rtunreal.runner.pub new file mode 100644 index 000000000..401941d8d --- /dev/null +++ b/kartei/rtunreal/ssh/rtunreal.runner.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDOQJOT6cBwg5xXHR+zpS7+VMcx4F73Qm+X4cWaFqRp+g5ru0M/xb+T2icX189j0qWe3BwpftupzaHy7h4sZRTIcRGwlu8LRGFY1WpL8ftgvWCG45ZD3Lp1nX3XpOfBTZD+XYoNOWVM4kuL/+wWYGQYKzo4Ui3kKFEPo0hrShN7GEMim76Xm3m7sldGW0vBzSk8DpLykDLt+RxrLeY2xGI112fjAVvaWn82KE+kflaQIF5XZNVPFqNTMvhRL+ZHTal1SeN3i2TdcbxV9DMLQ/s5bcSLatae/SMlYqNipTpX+lodBqc0d7e0LfwYJERkAHB0NX3TfQPB5tB8EReGMoOm2m0TPdIRGhaEAM5abB5cQr3KV/r2BAVTrcA6ij2f2GszVNNllhHQHvpv5RZUw8+htvFbaTv0Ww+3X1CY/B+hQQ9st4DIfC0o2or38BE1cn90mqfqvl1s/uplkX3ToYo8PU8j0SqVtBWNq/E7lHecTIZqUL5NX32xUnXvjmhZgtU= trr@runner diff --git a/kartei/rtunreal/ssh/rtunreal.spinner.pub b/kartei/rtunreal/ssh/rtunreal.spinner.pub new file mode 100644 index 000000000..79c83ea19 --- /dev/null +++ b/kartei/rtunreal/ssh/rtunreal.spinner.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAWBFNy2N6Exx7tHlbUDXERJjT7PhIs+vZIWPmhh3qLieeC1tAOf9XcbgVGL3bAryyaCEr1s2bZ6rs2L1JgFFJEGE9TCbfl2dfJIslCPP4OmKxwciIo+T4eXbanGDV0hzW+/vvMyQeWcVT27BrANYR7R28nURmXa1aQ9nWdnHy1Evuv4fI/e+6o3AKEji6Spl5FHs3T9+5vrEwsdq7Mewbfel6gAb3xmp9DIR0Kz0QnitwwErcZYgA2o64C6DLNgsG2l1PrZxE3/MaB6FyzCyOfU8C0FovWlvmmOXkwFPZz1HN1KkKZKV50H4ffiN0cVSLBt6NW6s0v7TWhJyrbIEr trr@spinner diff --git a/krebs/3modules/krebs-pages.nix b/krebs/3modules/krebs-pages.nix index c2df65ff5..6dd046a8b 100644 --- a/krebs/3modules/krebs-pages.nix +++ b/krebs/3modules/krebs-pages.nix @@ -38,6 +38,7 @@ in { enable = lib.mkDefault true; virtualHosts.${cfg.domain} = lib.mkMerge [ cfg.nginx { root = lib.mkForce cfg.package; + locations."= /ip".return = "200 $remote_addr"; locations."= /redirect".return = "301 /redirect"; }]; }; diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json index fe44c172d..17bffe634 100644 --- a/krebs/nixpkgs.json +++ b/krebs/nixpkgs.json @@ -1,9 +1,9 @@ { "url": "https://github.com/NixOS/nixpkgs", - "rev": "e8ec26f41fd94805d8fbf2552d8e7a449612c08e", - "date": "2022-12-09T22:31:53+00:00", - "path": "/nix/store/k2c06zy4vq019bb766rqnfszzx4q74zc-nixpkgs", - "sha256": "05jsnhb3a72m733qr7dvva71kark5268l77lrvmlylzwaqzq4yyx", + "rev": "9d692a724e74d2a49f7c985132972f991d144254", + "date": "2022-12-16T13:36:40-05:00", + "path": "/nix/store/76wc0ymx7rw348hpl0bp0yb77sf40xd6-nixpkgs", + "sha256": "1byh49p3kwi6adb1izaalj2ab9disfzq1cx526gwgv20ilmphvnr", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, |