summaryrefslogtreecommitdiffstats
path: root/krebs
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2016-03-16 01:54:49 +0100
committertv <tv@krebsco.de>2016-03-16 02:02:20 +0100
commit444d85ea86d150c4257781605ed372357cda2e18 (patch)
tree018dd455fdc9a74cfac8fddd165dfa5298606923 /krebs
parente6657cd46a6b97153f80006144fe6293f715bb7d (diff)
krebs types += ssh-{priv,pub}key
Diffstat (limited to 'krebs')
-rw-r--r--krebs/4lib/types.nix44
1 files changed, 23 insertions, 21 deletions
diff --git a/krebs/4lib/types.nix b/krebs/4lib/types.nix
index 334a94c3a..ed6ae9e4f 100644
--- a/krebs/4lib/types.nix
+++ b/krebs/4lib/types.nix
@@ -47,7 +47,7 @@ types // rec {
};
ssh.pubkey = mkOption {
- type = nullOr str;
+ type = nullOr ssh-pubkey;
default = null;
apply = x:
optionalTrace (x == null && config.owner.name == build.user.name)
@@ -55,25 +55,7 @@ types // rec {
x;
};
ssh.privkey = mkOption {
- type = nullOr (submodule {
- options = {
- bits = mkOption {
- type = nullOr (enum ["4096"]);
- default = null;
- };
- path = mkOption {
- type = either path str;
- apply = x: {
- path = toString x;
- string = x;
- }.${typeOf x};
- };
- type = mkOption {
- type = enum ["rsa" "ed25519"];
- default = "ed25519";
- };
- };
- });
+ type = nullOr ssh-privkey;
default = null;
};
};
@@ -184,7 +166,7 @@ types // rec {
default = config._module.args.name;
};
pubkey = mkOption {
- type = nullOr str;
+ type = nullOr ssh-pubkey;
default = null;
};
uid = mkOption {
@@ -198,6 +180,26 @@ types // rec {
addr = str;
addr4 = str;
addr6 = str;
+ ssh-pubkey = str;
+ ssh-privkey = submodule {
+ options = {
+ bits = mkOption {
+ type = nullOr (enum ["4096"]);
+ default = null;
+ };
+ path = mkOption {
+ type = either path str;
+ apply = x: {
+ path = toString x;
+ string = x;
+ }.${typeOf x};
+ };
+ type = mkOption {
+ type = enum ["rsa" "ed25519"];
+ default = "ed25519";
+ };
+ };
+ };
krebs.file-location = types.submodule {
options = {