summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--hel.nix6
-rw-r--r--odin.nix22
-rw-r--r--ymir.nix4
3 files changed, 27 insertions, 5 deletions
diff --git a/hel.nix b/hel.nix
index 158ab2fa..60ae34c9 100644
--- a/hel.nix
+++ b/hel.nix
@@ -202,14 +202,14 @@
202 uucp = { 202 uucp = {
203 enable = true; 203 enable = true;
204 nodeName = "hel"; 204 nodeName = "hel";
205 remoteNodes = ["isaac" "ymir"]; # legacy name for odin 205 remoteNodes = ["odin" "ymir"];
206 sshUser = { 206 sshUser = {
207 openssh.authorizedKeys.keys = [ ''restrict,command="${config.security.wrapperDir}/uucico" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFH1QWdgoC03nzW5GBuCl2pqASHeIXIYtE9IInHdaKcO uucp@ymir'' 207 openssh.authorizedKeys.keys = [ ''restrict,command="${config.security.wrapperDir}/uucico" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFH1QWdgoC03nzW5GBuCl2pqASHeIXIYtE9IInHdaKcO uucp@ymir''
208 ''restrict,command="${pkgs.writeScript "odin.sh" "#!${pkgs.stdenv.shell}\necho .\nexec -a uucico ${config.security.wrapperDir}/uucico\n"}" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJhACtnt9+3j2ev4QVA2QBlPtblPnu7yol2njgfMlHtC uucp@odin'' 208 ''restrict,command="${config.security.wrapperDir}/uucico" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJhACtnt9+3j2ev4QVA2QBlPtblPnu7yol2njgfMlHtC uucp@odin''
209 ]; 209 ];
210 }; 210 };
211 sshConfig = '' 211 sshConfig = ''
212 Host isaac 212 Host odin
213 Hostname odin.asgard.yggdrasil 213 Hostname odin.asgard.yggdrasil
214 IdentityFile ~/.ssh/odin 214 IdentityFile ~/.ssh/odin
215 Host ymir 215 Host ymir
diff --git a/odin.nix b/odin.nix
index 24129d38..aa822d0e 100644
--- a/odin.nix
+++ b/odin.nix
@@ -9,6 +9,7 @@
9 [ # Include the results of the hardware scan. 9 [ # Include the results of the hardware scan.
10 ./odin/hw.nix 10 ./odin/hw.nix
11 ./users.nix 11 ./users.nix
12 ./custom/uucp.nix
12 ]; 13 ];
13 14
14 # Use the GRUB 2 boot loader. 15 # Use the GRUB 2 boot loader.
@@ -73,6 +74,27 @@
73 74
74 services.haveged.enable = true; 75 services.haveged.enable = true;
75 76
77 services.uucp = {
78 enable = true;
79 nodeName = "odin";
80 remoteNodes = [ "ymir" "hel" ];
81 sshUser = {
82 openssh.authorizedKeys.keys = [ ''restrict,command="${config.security.wrapperDir}/uucico" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKD8ycFGfVkBL9wjA5Kc33cl6Qt5K2505G/38oH8Cy/e uucp@hel''
83 ''restrict,command="${config.security.wrapperDir}/uucico" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGANj+LJ4CI6VrAgBRocKCGq74kZnwD1PdKr/gdlfVr1 uucp@ymir''
84 ];
85 };
86 sshConfig = ''
87 Host ymir
88 Hostname ymir.niflheim.yggdrasil
89 IdentityFile ~/.ssh/ymir
90 Host hel
91 Hostname hel.midgard.yggdrasil
92 IdentityFile ~/.ssh/hel
93 '';
94 commandPath = ["${pkgs.rmail}/bin"];
95 defaultCommands = ["rmail"];
96 };
97
76 system.autoUpgrade.enable = true; 98 system.autoUpgrade.enable = true;
77 system.stateVersion = "18.09"; 99 system.stateVersion = "18.09";
78 100
diff --git a/ymir.nix b/ymir.nix
index 7f582980..14d9b36c 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -850,14 +850,14 @@ in rec {
850 services.uucp = { 850 services.uucp = {
851 enable = true; 851 enable = true;
852 nodeName = "ymir"; 852 nodeName = "ymir";
853 remoteNodes = ["isaac" "hel"]; # legacy name for odin 853 remoteNodes = [ "odin" "hel" ];
854 sshUser = { 854 sshUser = {
855 openssh.authorizedKeys.keys = [ ''restrict,command="${config.security.wrapperDir}/uucico" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEgtDHA7oDIaRwggGGznNaKZF68rFTziqefSCn1t9ZKe uucp@odin'' 855 openssh.authorizedKeys.keys = [ ''restrict,command="${config.security.wrapperDir}/uucico" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEgtDHA7oDIaRwggGGznNaKZF68rFTziqefSCn1t9ZKe uucp@odin''
856 ''restrict,command="${config.security.wrapperDir}/uucico" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOWBybBQKbPucqBgULQ1phv7IKFWl1Xc4drkCx3D5mIz uucp@hel'' 856 ''restrict,command="${config.security.wrapperDir}/uucico" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOWBybBQKbPucqBgULQ1phv7IKFWl1Xc4drkCx3D5mIz uucp@hel''
857 ]; 857 ];
858 }; 858 };
859 sshConfig = '' 859 sshConfig = ''
860 Host isaac 860 Host odin
861 Hostname odin.asgard.yggdrasil 861 Hostname odin.asgard.yggdrasil
862 IdentityFile ~/.ssh/odin 862 IdentityFile ~/.ssh/odin
863 Host hel 863 Host hel