Merge remote-tracking branch 'mic92/master'

This commit is contained in:
lassulus 2022-01-09 18:04:22 +01:00
commit f67bd5783d

View File

@ -526,8 +526,10 @@ in {
}; };
turingmachine = { turingmachine = {
owner = config.krebs.users.mic92; owner = config.krebs.users.mic92;
nets = { nets = rec {
internet.addrs = [ "turingmachine.thalheim.io" ];
retiolum = { retiolum = {
via = internet;
aliases = [ aliases = [
"turingmachine.r" "turingmachine.r"
]; ];
@ -678,7 +680,9 @@ in {
jarvis = { jarvis = {
owner = config.krebs.users.mic92; owner = config.krebs.users.mic92;
nets = rec { nets = rec {
internet.addrs = [ "jarvis.thalheim.io" ];
retiolum = { retiolum = {
via = internet;
aliases = [ "jarvis.r" ]; aliases = [ "jarvis.r" ];
tinc.pubkey = '' tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY----- -----BEGIN RSA PUBLIC KEY-----
@ -697,7 +701,9 @@ in {
bernie = { bernie = {
owner = config.krebs.users.mic92; owner = config.krebs.users.mic92;
nets = rec { nets = rec {
internet.addrs = [ "bernie.thalheim.io" ];
retiolum = { retiolum = {
via = internet;
aliases = [ "bernie.r" ]; aliases = [ "bernie.r" ];
tinc.pubkey = '' tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY----- -----BEGIN RSA PUBLIC KEY-----
@ -719,7 +725,6 @@ in {
}; };
}; };
ryan = { ryan = {
owner = config.krebs.users.mic92; owner = config.krebs.users.mic92;
nets = rec { nets = rec {