summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--hel.nix27
-rw-r--r--ymir.nix5
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 @@
98 ip4 = [ { address = "10.141.2.2"; prefixLength = 32; } ]; 98 ip4 = [ { address = "10.141.2.2"; prefixLength = 32; } ];
99 }; 99 };
100 }); 100 });
101 uucp = {
102 enable = true;
103 nodeName = "hel";
104 remoteNodes = ["isaac" "ymir"]; # legacy name for odin
105 sshUser = {
106 openssh.authorizedKeys.keys = [ ''no-port-forwarding,no-X11-forwarding,no-agent-forwarding,command="/var/setuid-wrappers/uucico" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEgtDHA7oDIaRwggGGznNaKZF68rFTziqefSCn1t9ZKe uucp@odin''
107 '''no-port-forwarding,no-X11-forwarding,no-agent-forwarding,command="/var/setuid-wrappers/uucico" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFH1QWdgoC03nzW5GBuCl2pqASHeIXIYtE9IInHdaKcO uucp@ymir''
108 ];
109 };
110 sshConfig = ''
111 Host isaac
112 Hostname odin.asgard.yggdrasil
113 IdentityFile ~/.ssh/odin
114 Host ymir
115 Hostname ymir.niflheim.yggdrasil
116 IdentityFile ~/.ssh/ymir
117 '';
118 commandPath = [];
119 defaultCommands = [];
120 };
101 }; 121 };
102 122
103 users = { 123 users = {
@@ -105,7 +125,12 @@
105 125
106 extraUsers.root = { inherit (import ./users/gkleen.nix) shell hashedPassword; }; 126 extraUsers.root = { inherit (import ./users/gkleen.nix) shell hashedPassword; };
107 127
108 extraGroups = { network = {}; }; 128 extraGroups = {
129 network = {};
130 media = {
131 members = [ "gkleen" "uucp" ];
132 };
133 };
109 }; 134 };
110 135
111 security = { 136 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 {
481 services.uucp = { 481 services.uucp = {
482 enable = true; 482 enable = true;
483 nodeName = "ymir"; 483 nodeName = "ymir";
484 remoteNodes = ["isaac"]; # legacy name for odin 484 remoteNodes = ["isaac" "hel"]; # legacy name for odin
485 sshUser = { 485 sshUser = {
486 openssh.authorizedKeys.keys = [ ''no-port-forwarding,no-X11-forwarding,no-agent-forwarding,command="/var/setuid-wrappers/uucico" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEgtDHA7oDIaRwggGGznNaKZF68rFTziqefSCn1t9ZKe uucp@odin'' 486 openssh.authorizedKeys.keys = [ ''no-port-forwarding,no-X11-forwarding,no-agent-forwarding,command="/var/setuid-wrappers/uucico" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEgtDHA7oDIaRwggGGznNaKZF68rFTziqefSCn1t9ZKe uucp@odin''
487 ]; 487 ];
@@ -490,6 +490,9 @@ in rec {
490 Host isaac 490 Host isaac
491 Hostname odin.asgard.yggdrasil 491 Hostname odin.asgard.yggdrasil
492 IdentityFile ~/.ssh/odin 492 IdentityFile ~/.ssh/odin
493 Host hel
494 Hostname hel.midgard.yggdrasil
495 IdentityFile ~/.ssh/hel
493 ''; 496 '';
494 commandPath = ["${pkgs.rmail}/bin" "${pkgs.push2bin}/bin"]; 497 commandPath = ["${pkgs.rmail}/bin" "${pkgs.push2bin}/bin"];
495 defaultCommands = ["rmail" "push2bin"]; 498 defaultCommands = ["rmail" "push2bin"];