summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--custom/uucp.nix13
-rw-r--r--ymir.nix1
2 files changed, 14 insertions, 0 deletions
diff --git a/custom/uucp.nix b/custom/uucp.nix
index 90ad5f0f..080a5951 100644
--- a/custom/uucp.nix
+++ b/custom/uucp.nix
@@ -17,6 +17,7 @@ let
17 chat "" 17 chat ""
18 protocol e 18 protocol e
19 command-path ${concatStringsSep " " config.services.uucp.commandPath} 19 command-path ${concatStringsSep " " config.services.uucp.commandPath}
20 commands ${if config.services.uucp.commands ? name then concatStringsSep " " config.services.uucp.commands."${name}" else config.services.uucp.defaultCommands}
20 ''; 21 '';
21in { 22in {
22 options = { 23 options = {
@@ -64,6 +65,18 @@ in {
64 ''; 65 '';
65 }; 66 };
66 67
68 defaultCommands = mkOption {
69 type = types.listOf types.string;
70 default = ["rmail"];
71 description = "Commands allowed for remotes without explicit override";
72 };
73
74 commands = mkOption {
75 type = types.attrsOf (types.listOf types.string);
76 default = {};
77 description = "Override commands for specific remotes";
78 };
79
67 spoolDir = mkOption { 80 spoolDir = mkOption {
68 type = types.path; 81 type = types.path;
69 default = "/var/spool/uucp"; 82 default = "/var/spool/uucp";
diff --git a/ymir.nix b/ymir.nix
index e8f92606..9a9f7b38 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -460,6 +460,7 @@ in rec {
460 Hostname odin.asgard.yggdrasil 460 Hostname odin.asgard.yggdrasil
461 IdentityFile ~/.ssh/odin 461 IdentityFile ~/.ssh/odin
462 ''; 462 '';
463 defaultCommands = ["rmail"];
463 }; 464 };
464 465
465 services.atd = { 466 services.atd = {