2 files changed, 30 insertions, 2 deletions

diff --git a/hel.nix b/hel.nix
index 3531ded5..ce354711 100644
--- a/hel.nix
+++ b/hel.nix
@@ -98,6 +98,26 @@
         ip4 = [ { address = "10.141.2.2"; prefixLength = 32; } ];
       };
     });
+    uucp = {
+      enable = true;
+      nodeName = "hel";
+      remoteNodes = ["isaac" "ymir"]; # legacy name for odin
+      sshUser = {
+        openssh.authorizedKeys.keys = [ ''no-port-forwarding,no-X11-forwarding,no-agent-forwarding,command="/var/setuid-wrappers/uucico" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEgtDHA7oDIaRwggGGznNaKZF68rFTziqefSCn1t9ZKe uucp@odin''
+                                        '''no-port-forwarding,no-X11-forwarding,no-agent-forwarding,command="/var/setuid-wrappers/uucico" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFH1QWdgoC03nzW5GBuCl2pqASHeIXIYtE9IInHdaKcO uucp@ymir''
+                                      ];
+      };
+      sshConfig = ''
+        Host isaac
+          Hostname odin.asgard.yggdrasil
+          IdentityFile ~/.ssh/odin
+        Host ymir
+          Hostname ymir.niflheim.yggdrasil
+          IdentityFile ~/.ssh/ymir
+      '';
+    commandPath = [];
+    defaultCommands = [];
+  };
   };
 
   users = {
@@ -105,7 +125,12 @@
   
     extraUsers.root = { inherit (import ./users/gkleen.nix) shell hashedPassword; };
 
-    extraGroups = { network = {}; };
+    extraGroups = {
+      network = {};
+      media = {
+        members = [ "gkleen" "uucp" ];
+      };
+    };
   };
 
   security = {
diff --git a/ymir.nix b/ymir.nix
index 74f4e168..376f91db 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -481,7 +481,7 @@ in rec {
   services.uucp = {
     enable = true;
     nodeName = "ymir";
-    remoteNodes = ["isaac"]; # legacy name for odin
+    remoteNodes = ["isaac" "hel"]; # legacy name for odin
     sshUser = {
       openssh.authorizedKeys.keys = [ ''no-port-forwarding,no-X11-forwarding,no-agent-forwarding,command="/var/setuid-wrappers/uucico" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEgtDHA7oDIaRwggGGznNaKZF68rFTziqefSCn1t9ZKe uucp@odin''
                                     ];
@@ -490,6 +490,9 @@ in rec {
       Host isaac
         Hostname odin.asgard.yggdrasil
         IdentityFile ~/.ssh/odin
+      Host hel
+        Hostname hel.midgard.yggdrasil
+        IdentityFile ~/.ssh/hel
     '';
     commandPath = ["${pkgs.rmail}/bin" "${pkgs.push2bin}/bin"];
     defaultCommands = ["rmail" "push2bin"];