Merge remote-tracking branch 'lass/master'

This commit is contained in:
makefu 2019-01-03 23:27:05 +01:00
commit 704f2854f0
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225

View File

@ -348,7 +348,7 @@ in {
owner = config.krebs.users.Mic92; owner = config.krebs.users.Mic92;
nets = { nets = {
retiolum = { retiolum = {
ip4.addr = "10.243.29.172"; ip4.addr = "10.243.29.176";
aliases = [ "matchbox.r" ]; aliases = [ "matchbox.r" ];
tinc.pubkey = '' tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY----- -----BEGIN RSA PUBLIC KEY-----