summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2016-04-27 12:47:34 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2016-04-27 12:47:34 +0200
commit8032fa45ce4cf74776ad526888de04cc5866105f (patch)
tree05f632c106e928dac3e59eafc8fcfd54767a3c90
parentd3df4cba29788a3b5520064415e34d9cd1e34277 (diff)
downloadnixos-8032fa45ce4cf74776ad526888de04cc5866105f.tar
nixos-8032fa45ce4cf74776ad526888de04cc5866105f.tar.gz
nixos-8032fa45ce4cf74776ad526888de04cc5866105f.tar.bz2
nixos-8032fa45ce4cf74776ad526888de04cc5866105f.tar.xz
nixos-8032fa45ce4cf74776ad526888de04cc5866105f.zip
uucp hostname
-rw-r--r--custom/uucp.nix8
-rw-r--r--ymir.nix1
2 files changed, 9 insertions, 0 deletions
diff --git a/custom/uucp.nix b/custom/uucp.nix
index a47e0157..6fabe882 100644
--- a/custom/uucp.nix
+++ b/custom/uucp.nix
@@ -26,6 +26,12 @@ in {
26 ''; 26 '';
27 }; 27 };
28 28
29 nodeName = mkOption {
30 type = types.str;
31 default = "nixos";
32 description = "uucp node name";
33 };
34
29 sshUser = mkOption { 35 sshUser = mkOption {
30 type = types.attrs; 36 type = types.attrs;
31 default = {}; 37 default = {};
@@ -91,6 +97,8 @@ in {
91 config = mkIf config.services.uucp.enable { 97 config = mkIf config.services.uucp.enable {
92 environment.etc."uucp/config" = { 98 environment.etc."uucp/config" = {
93 text = '' 99 text = ''
100 hostname ${config.services.uucp.nodeName}
101
94 spool ${config.services.uucp.spoolDir} 102 spool ${config.services.uucp.spoolDir}
95 lockdir ${config.services.uucp.lockDir} 103 lockdir ${config.services.uucp.lockDir}
96 pubdir ${config.services.uucp.pubDir} 104 pubdir ${config.services.uucp.pubDir}
diff --git a/ymir.nix b/ymir.nix
index 7ccde30b..755d0a2c 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -340,6 +340,7 @@ in rec {
340 340
341 services.uucp = { 341 services.uucp = {
342 enable = true; 342 enable = true;
343 nodeName = "ymir";
343 remoteNodes = ["isaac"]; # legacy name for odin 344 remoteNodes = ["isaac"]; # legacy name for odin
344 sshUser = { 345 sshUser = {
345 openssh.authorizedKeys.keys = [ ''no-port-forwarding,no-X11-forwarding,no-agent-forwarding,command="/var/setuid-wrappers/uucico" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEgtDHA7oDIaRwggGGznNaKZF68rFTziqefSCn1t9ZKe uucp@odin'' 346 openssh.authorizedKeys.keys = [ ''no-port-forwarding,no-X11-forwarding,no-agent-forwarding,command="/var/setuid-wrappers/uucico" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEgtDHA7oDIaRwggGGznNaKZF68rFTziqefSCn1t9ZKe uucp@odin''