diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2020-01-06 14:11:15 +0100 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2020-01-06 14:11:15 +0100 |
commit | c0bfedefa311252e239e8609e110f130b2b2b166 (patch) | |
tree | b7ac8f43eb9f94c5801ca81ce5611d087dc57309 /custom | |
parent | fb9155ed7a6d8bfa9ea39a720e671d89abe5842f (diff) | |
download | nixos-c0bfedefa311252e239e8609e110f130b2b2b166.tar nixos-c0bfedefa311252e239e8609e110f130b2b2b166.tar.gz nixos-c0bfedefa311252e239e8609e110f130b2b2b166.tar.bz2 nixos-c0bfedefa311252e239e8609e110f130b2b2b166.tar.xz nixos-c0bfedefa311252e239e8609e110f130b2b2b166.zip |
address warnings
Diffstat (limited to 'custom')
-rw-r--r-- | custom/uucp.nix | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/custom/uucp.nix b/custom/uucp.nix index 3ee52269..7fccb7e5 100644 --- a/custom/uucp.nix +++ b/custom/uucp.nix | |||
@@ -46,31 +46,31 @@ let | |||
46 | nodeCfg = { | 46 | nodeCfg = { |
47 | options = { | 47 | options = { |
48 | commands = mkOption { | 48 | commands = mkOption { |
49 | type = types.listOf types.string; | 49 | type = types.listOf types.str; |
50 | default = cfg.defaultCommands; | 50 | default = cfg.defaultCommands; |
51 | description = "Commands to allow for this remote"; | 51 | description = "Commands to allow for this remote"; |
52 | }; | 52 | }; |
53 | 53 | ||
54 | protocols = mkOption { | 54 | protocols = mkOption { |
55 | type = types.string; | 55 | type = types.separatedString ""; |
56 | default = cfg.defaultProtocols; | 56 | default = cfg.defaultProtocols; |
57 | description = "UUCP protocols to use for this remote"; | 57 | description = "UUCP protocols to use for this remote"; |
58 | }; | 58 | }; |
59 | 59 | ||
60 | publicKeys = mkOption { | 60 | publicKeys = mkOption { |
61 | type = types.listOf types.string; | 61 | type = types.listOf types.str; |
62 | default = []; | 62 | default = []; |
63 | description = "SSH public keys for this node"; | 63 | description = "SSH public keys for this node"; |
64 | }; | 64 | }; |
65 | 65 | ||
66 | generateKey = mkOption { | 66 | generateKey = mkOption { |
67 | type = types.listOf types.string; | 67 | type = types.listOf types.str; |
68 | default = [ "-t" "ed25519" "-N" "" ]; | 68 | default = [ "-t" "ed25519" "-N" "" ]; |
69 | description = "Arguments to pass to `ssh-keygen` to generate a keypair for communication with this host"; | 69 | description = "Arguments to pass to `ssh-keygen` to generate a keypair for communication with this host"; |
70 | }; | 70 | }; |
71 | 71 | ||
72 | hostnames = mkOption { | 72 | hostnames = mkOption { |
73 | type = types.listOf types.string; | 73 | type = types.listOf types.str; |
74 | default = []; | 74 | default = []; |
75 | description = "Hostnames to try in order when connecting"; | 75 | description = "Hostnames to try in order when connecting"; |
76 | }; | 76 | }; |
@@ -125,19 +125,19 @@ in { | |||
125 | }; | 125 | }; |
126 | 126 | ||
127 | defaultCommands = mkOption { | 127 | defaultCommands = mkOption { |
128 | type = types.listOf types.string; | 128 | type = types.listOf types.str; |
129 | default = ["rmail"]; | 129 | default = ["rmail"]; |
130 | description = "Commands allowed for remotes without explicit override"; | 130 | description = "Commands allowed for remotes without explicit override"; |
131 | }; | 131 | }; |
132 | 132 | ||
133 | defaultProtocols = mkOption { | 133 | defaultProtocols = mkOption { |
134 | type = types.string; | 134 | type = types.separatedString ""; |
135 | default = "te"; | 135 | default = "te"; |
136 | description = "UUCP protocol to use within ssh unless overriden"; | 136 | description = "UUCP protocol to use within ssh unless overriden"; |
137 | }; | 137 | }; |
138 | 138 | ||
139 | incomingProtocols = mkOption { | 139 | incomingProtocols = mkOption { |
140 | type = types.string; | 140 | type = types.separatedString ""; |
141 | default = "te"; | 141 | default = "te"; |
142 | description = "UUCP protocols to use when called"; | 142 | description = "UUCP protocols to use when called"; |
143 | }; | 143 | }; |
@@ -209,7 +209,7 @@ in { | |||
209 | }; | 209 | }; |
210 | 210 | ||
211 | extraConfig = mkOption { | 211 | extraConfig = mkOption { |
212 | type = types.string; | 212 | type = types.lines; |
213 | default = '' | 213 | default = '' |
214 | run-uuxqt 1 | 214 | run-uuxqt 1 |
215 | ''; | 215 | ''; |
@@ -217,11 +217,11 @@ in { | |||
217 | }; | 217 | }; |
218 | 218 | ||
219 | extraSys = mkOption { | 219 | extraSys = mkOption { |
220 | type = types.string; | 220 | type = types.lines; |
221 | default = '' | 221 | default = '' |
222 | protocol-parameter g packet-size 4096 | 222 | protocol-parameter g packet-size 4096 |
223 | ''; | 223 | ''; |
224 | description = "Extra configuration to prepend verbatim to `/etc/uucp/sys`"; | 224 | description = "Extra configuration to prepend verbatim to `/etc/uucp/sys`"; |
225 | }; | 225 | }; |
226 | }; | 226 | }; |
227 | }; | 227 | }; |