summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2016-03-16 01:57:03 +0100
committertv <tv@krebsco.de>2016-03-16 02:03:17 +0100
commit9d16ea61451aff36963cef3610ac8d51ed0b488b (patch)
tree290958cec7540d5697ec57509be312222bfb1ed9
parent444d85ea86d150c4257781605ed372357cda2e18 (diff)
krebs types += pgp-pubkey, user.pgp.pubkey
-rw-r--r--krebs/3modules/tv/default.nix2
-rw-r--r--krebs/4lib/types.nix13
2 files changed, 14 insertions, 1 deletions
diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix
index dd1f0d289..262f508c3 100644
--- a/krebs/3modules/tv/default.nix
+++ b/krebs/3modules/tv/default.nix
@@ -357,7 +357,7 @@ with config.krebs.lib;
};
tv = {
mail = "tv@nomic.retiolum";
- pgp.pubkey = ''
+ pgp.pubkeys.default = ''
-----BEGIN PGP PUBLIC KEY BLOCK-----
mQINBFbJ/B0BEADZx8l5gRurzhEHcc3PbBepdZqDJQZ2cGHixi8VEk9iN25qJO5y
HB0q5sQRsh7oNCbzKp6qRhaG9kXmEda+Uu+qbHWxE32QcT76+W8npH73qthaFwC/
diff --git a/krebs/4lib/types.nix b/krebs/4lib/types.nix
index ed6ae9e4f..112984445 100644
--- a/krebs/4lib/types.nix
+++ b/krebs/4lib/types.nix
@@ -165,6 +165,16 @@ types // rec {
type = username;
default = config._module.args.name;
};
+ pgp.pubkeys = mkOption {
+ type = attrsOf pgp-pubkey;
+ default = {};
+ description = ''
+ Set of user's PGP public keys.
+
+ Modules supporting PGP may use well-known key names to define option
+ defaults, e.g. using `getAttrDef well-known-name pubkeys`.
+ '';
+ };
pubkey = mkOption {
type = nullOr ssh-pubkey;
default = null;
@@ -180,6 +190,9 @@ types // rec {
addr = str;
addr4 = str;
addr6 = str;
+
+ pgp-pubkey = str;
+
ssh-pubkey = str;
ssh-privkey = submodule {
options = {