makefu/stockholm
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

krebs types += pgp-pubkey, user.pgp.pubkey

Browse source
This commit is contained in:
tv 2016-03-16 01:57:03 +01:00
parent 444d85ea86
commit 9d16ea6145
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
krebs/3modules/tv/default.nix
View file

@ -357,7 +357,7 @@ with config.krebs.lib;
}; };
tv = { tv = {
mail = "tv@nomic.retiolum"; mail = "tv@nomic.retiolum";
pgp.pubkey = '' pgp.pubkeys.default = ''
-----BEGIN PGP PUBLIC KEY BLOCK----- -----BEGIN PGP PUBLIC KEY BLOCK-----
mQINBFbJ/B0BEADZx8l5gRurzhEHcc3PbBepdZqDJQZ2cGHixi8VEk9iN25qJO5y mQINBFbJ/B0BEADZx8l5gRurzhEHcc3PbBepdZqDJQZ2cGHixi8VEk9iN25qJO5y
HB0q5sQRsh7oNCbzKp6qRhaG9kXmEda+Uu+qbHWxE32QcT76+W8npH73qthaFwC/ HB0q5sQRsh7oNCbzKp6qRhaG9kXmEda+Uu+qbHWxE32QcT76+W8npH73qthaFwC/

13
krebs/4lib/types.nix
View file

@ -165,6 +165,16 @@ types // rec {
type = username; type = username;
default = config._module.args.name; 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 { pubkey = mkOption {
type = nullOr ssh-pubkey; type = nullOr ssh-pubkey;
default = null; default = null;
@ -180,6 +190,9 @@ types // rec {
addr = str; addr = str;
addr4 = str; addr4 = str;
addr6 = str; addr6 = str;
pgp-pubkey = str;
ssh-pubkey = str; ssh-pubkey = str;
ssh-privkey = submodule { ssh-privkey = submodule {
options = { options = {