Merge remote-tracking branch 'mic92/master'

This commit is contained in:
lassulus 2022-01-02 22:54:22 +01:00
commit dc42812610

View File

@ -300,6 +300,11 @@ in {
}; };
yasmin = { yasmin = {
owner = config.krebs.users.mic92; owner = config.krebs.users.mic92;
nets.internet = {
ip4.addr = "131.159.102.7";
ip6.addr = "2a09:80c0:102::7";
aliases = [ "yasmin.i" ];
};
nets.retiolum = { nets.retiolum = {
ip4.addr = "10.243.29.197"; ip4.addr = "10.243.29.197";
aliases = [ aliases = [
@ -674,7 +679,6 @@ in {
owner = config.krebs.users.mic92; owner = config.krebs.users.mic92;
nets = rec { nets = rec {
retiolum = { retiolum = {
ip4.addr = "10.243.29.169";
aliases = [ "bernie.r" ]; aliases = [ "bernie.r" ];
tinc.pubkey = '' tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY----- -----BEGIN RSA PUBLIC KEY-----