Merge remote-tracking branch 'mic92/master'

This commit is contained in:
lassulus 2023-03-26 06:10:37 +02:00
commit acbdb53d8e
2 changed files with 35 additions and 0 deletions

View File

@ -788,6 +788,7 @@ in {
aliases = [ aliases = [
"jack.r" "jack.r"
"stable-confusion.r" "stable-confusion.r"
"llama.r"
]; ];
tinc.pubkey = '' tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY----- -----BEGIN RSA PUBLIC KEY-----

View File

@ -0,0 +1,34 @@
{ config, ... }: let
lib = import ../../lib;
hostDefaults = hostName: host: lib.flip lib.recursiveUpdate host ({
ci = false;
external = true;
monitoring = false;
} // lib.optionalAttrs (host.nets?retiolum) {
nets.retiolum.ip6.addr =
(lib.krebs.genipv6 "retiolum" "external" { inherit hostName; }).address;
});
in {
users.srounce.mail = "samuelrounce@gmail.com";
hosts = lib.mapAttrs hostDefaults {
workbox = {
owner = config.krebs.users.srounce;
nets.retiolum = {
aliases = [ "srounce.r" ];
tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEAsLQ4ZEwEbgHCh7yQvZWms6586Q3Ni+dF6pmkQdxrNb/BLlplB2Db
sDYVMAfamXDd/jPKpoevwRaXoImxk1IHSN4ZJ2liaZNDBOJJ0CnXdJHGQ3SnV50x
9ABAeP/lmT95lhWuCg0qS0xY60ax3EDhTVYk51dPwwoBNE6dwO/lJr6vgtKBI7fV
/IgoF7L8G7AEPz61vS0sCHld537bEPfZ3Us4gUC6/V+xKnkBRDuCgFxemOjNdu0F
cqEyxwrPcQoFtOt9ZDF8817qdFsRQsgM8LsnDti8mhxDR/0deTYARkWIoRjLU+p9
XLCdDBEGsbl4Bb6tYT9jz9RCNNJeXogE2wIDAQAB
-----END RSA PUBLIC KEY-----
'';
tinc.pubkey_ed25519 = "E9bMsS3w72hIjp2fYicwgpdwSJDUQbh2dHEDk6F5JdO";
};
};
};
}