Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'mic92/master'

Browse Source
This commit is contained in:
lassulus 2020-08-20 22:20:00 +02:00
commit 3f1d128a16
4 changed files with 51 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
krebs/1systems/puyak/config.nix
View File

@ -84,7 +84,7 @@
''; '';
users.users.joerg = { users.users.joerg = {
openssh.authorizedKeys.keys = [ config.krebs.users.Mic92.pubkey ]; openssh.authorizedKeys.keys = [ config.krebs.users.mic92.pubkey ];
isNormalUser = true; isNormalUser = true;
shell = "/run/current-system/sw/bin/zsh"; shell = "/run/current-system/sw/bin/zsh";
}; };

4
krebs/3modules/external/default.nix vendored
View File

@ -465,9 +465,9 @@ in {
mail = "kieran.meinhardt@gmail.com"; mail = "kieran.meinhardt@gmail.com";
pubkey = ssh-for "kmein"; pubkey = ssh-for "kmein";
}; };
Mic92 = { mic92 = {
mail = "joerg@thalheim.io"; mail = "joerg@thalheim.io";
pubkey = ssh-for "Mic92"; pubkey = ssh-for "mic92";
}; };
qubasa = { qubasa = {
mail = "luis.nixos@gmail.com"; mail = "luis.nixos@gmail.com";

71
krebs/3modules/external/mic92.nix vendored
View File

@ -11,7 +11,7 @@ with import <stockholm/lib>;
in { in {
hosts = mapAttrs hostDefaults { hosts = mapAttrs hostDefaults {
amy = { amy = {
owner = config.krebs.users.Mic92; owner = config.krebs.users.mic92;
nets = rec { nets = rec {
internet = { internet = {
ip4.addr = "129.215.165.57"; ip4.addr = "129.215.165.57";
@ -44,7 +44,7 @@ in {
}; };
}; };
clara = { clara = {
owner = config.krebs.users.Mic92; owner = config.krebs.users.mic92;
nets = rec { nets = rec {
internet = { internet = {
ip4.addr = "129.215.165.58"; ip4.addr = "129.215.165.58";
@ -77,7 +77,7 @@ in {
}; };
}; };
dimitrios = { dimitrios = {
owner = config.krebs.users.Mic92; owner = config.krebs.users.mic92;
nets = { nets = {
retiolum = { retiolum = {
ip4.addr = "10.243.29.183"; ip4.addr = "10.243.29.183";
@ -98,7 +98,7 @@ in {
}; };
}; };
donna = { donna = {
owner = config.krebs.users.Mic92; owner = config.krebs.users.mic92;
nets = rec { nets = rec {
internet = { internet = {
ip4.addr = "129.215.165.54"; ip4.addr = "129.215.165.54";
@ -132,7 +132,7 @@ in {
}; };
}; };
dpdkm = { dpdkm = {
owner = config.krebs.users.Mic92; owner = config.krebs.users.mic92;
nets = rec { nets = rec {
retiolum = { retiolum = {
ip4.addr = "10.243.29.173"; ip4.addr = "10.243.29.173";
@ -156,7 +156,7 @@ in {
}; };
}; };
herbert = { herbert = {
owner = config.krebs.users.Mic92; owner = config.krebs.users.mic92;
nets = rec { nets = rec {
retiolum = { retiolum = {
addrs = [ addrs = [
@ -179,7 +179,7 @@ in {
}; };
}; };
inspector = { inspector = {
owner = config.krebs.users.Mic92; owner = config.krebs.users.mic92;
nets = rec { nets = rec {
internet = { internet = {
ip4.addr = "141.76.44.154"; ip4.addr = "141.76.44.154";
@ -208,7 +208,7 @@ in {
}; };
}; };
eddie = { eddie = {
owner = config.krebs.users.Mic92; owner = config.krebs.users.mic92;
nets = rec { nets = rec {
internet = { internet = {
# eddie.thalheim.io # eddie.thalheim.io
@ -242,7 +242,7 @@ in {
}; };
}; };
eve = { eve = {
owner = config.krebs.users.Mic92; owner = config.krebs.users.mic92;
nets = rec { nets = rec {
internet = { internet = {
# eve.thalheim.io # eve.thalheim.io
@ -273,13 +273,17 @@ in {
Pxol8FwH5+Q72bLtvg5Zva8D0Vx2U1jYSHEkRDDzaS5Z6Fus+zeZVMsCAwEAAQ== Pxol8FwH5+Q72bLtvg5Zva8D0Vx2U1jYSHEkRDDzaS5Z6Fus+zeZVMsCAwEAAQ==
-----END RSA PUBLIC KEY----- -----END RSA PUBLIC KEY-----
''; '';
# ohorn lan tinc.subnets = [
tinc.subnets = [ "fd42:4492:6a6d:500:8526:2adf:7451:8bbb" ]; # ohorn lan
"fd42:4492:6a6d:500:8526:2adf:7451:8bbb"
# docker network
"42:0000:002b:1605:3::/80"
];
}; };
}; };
}; };
martha = { martha = {
owner = config.krebs.users.Mic92; owner = config.krebs.users.mic92;
nets = rec { nets = rec {
internet = { internet = {
ip4.addr = "129.215.165.53"; ip4.addr = "129.215.165.53";
@ -313,7 +317,7 @@ in {
}; };
}; };
matchbox = { matchbox = {
owner = config.krebs.users.Mic92; owner = config.krebs.users.mic92;
nets = { nets = {
retiolum = { retiolum = {
ip4.addr = "10.243.29.176"; ip4.addr = "10.243.29.176";
@ -339,7 +343,7 @@ in {
}; };
}; };
rock = { rock = {
owner = config.krebs.users.Mic92; owner = config.krebs.users.mic92;
nets = { nets = {
retiolum = { retiolum = {
ip4.addr = "10.243.29.171"; ip4.addr = "10.243.29.171";
@ -363,7 +367,7 @@ in {
}; };
}; };
rose = { rose = {
owner = config.krebs.users.Mic92; owner = config.krebs.users.mic92;
nets = rec { nets = rec {
internet = { internet = {
ip4.addr = "129.215.165.52"; ip4.addr = "129.215.165.52";
@ -397,7 +401,7 @@ in {
}; };
}; };
turingmachine = { turingmachine = {
owner = config.krebs.users.Mic92; owner = config.krebs.users.mic92;
nets = { nets = {
retiolum = { retiolum = {
ip4.addr = "10.243.29.168"; ip4.addr = "10.243.29.168";
@ -425,7 +429,7 @@ in {
}; };
}; };
harsha = { harsha = {
owner = config.krebs.users.Mic92; owner = config.krebs.users.mic92;
nets = { nets = {
retiolum = { retiolum = {
ip4.addr = "10.243.29.184"; ip4.addr = "10.243.29.184";
@ -446,22 +450,35 @@ in {
}; };
}; };
eva = { eva = {
owner = config.krebs.users.Mic92; owner = config.krebs.users.mic92;
nets = { nets = rec {
internet = {
# eva.thalheim.io
ip4.addr = "52.59.172.193";
ip6.addr = "2a05:d014:301:a601:ef0e:5434:d814:b8ed";
aliases = [ "eva.i" ];
};
retiolum = { retiolum = {
via = internet;
ip4.addr = "10.243.29.185"; ip4.addr = "10.243.29.185";
aliases = [ aliases = [
"eva.r" "eva.r"
]; ];
tinc.pubkey = '' tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY----- -----BEGIN PUBLIC KEY-----
MIIBCgKCAQEAqIc+ozq3hKHMe/X3v4j+6or8LMjEV7MtQ8/+n00xpG4NkI4G38Bv MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyHptaExEcSUjEJ+RH33h
3nmAcV7OhN6of0fr0psbBmym+2VxCZbpl8E3g1GWSKpAvlmP/9v4wDVdrADaTvXC uRK0Ttq8mJLDosWFYcoQkcL9S54aO9kF1gRJAKPBHoOt/IGeOxg2LNYWK6UjWfUy
pzCxejtCwEhKLisnMwCMJCuUPbIsSBU+IQDPKP7NP0yY5VapgW3Xl3qXpnehCW1r LB9c42EQ1wWZ2jSJ0LJgYzjR9cp3dlo9aHSa//O6p6eLpXRo9QLf8+aIWhNW5+BG
NBZjZASnhSXcJRLJayEDN6uBviYrnnfbrHOx4fPcjQPTHX5RYr3EbgGZQO9xki44 sLIMR5b6Ngc2l8xQS+wvMmvTWJt3LyfQ6AKiKwCjeyrUFiuw0VWSn1I6n7H+CZBZ
9dKT4EA95lupTqC3wzuQbaNpvIuVzmggiDY/NsBIVh0/2XjGnO54wtCEPudaLnWd f/UvSxLucy1e0rvbHoTITOflIAfA84iCHsHsZjVqrx1iyOMdPtY2sBPmWhtVemDo
WNtc1wfVFB6gzgG1N7msOuFUReOIfyF/ywIDAQAB duwzUpIuaJnWS7JOB4jsYWm672/KfzK7yAivqxD19OwqfZ3nNQ7sEDb3p4udw2Lf
-----END RSA PUBLIC KEY----- 0dqHwZ5Hoj21vs3XiXX/SHcSf5QLzpj1MWBkV3r1D8I8v3P5qUbLunCofp3d9GxE
N0gK06gqbLNonJvC/WD7lxeY32Rh1wYXbzbD/X6aWe/oD8WMIl312hH4cHQHOnVT
t76NISlYTPxwX5mfFsBm8t0GjnnWY2jLwaefk7N/CwoDaKhkhmw1oeAZMuRcDRvE
0ecpO4CZ6CcYERLxoYHgEAj3cMkSrQ8dT6XS4b9EO4hW4zCQ3RK9xDz71+uaihuB
6uuTTsn7s0PYBJDNdccOf1Qt8fqPPgzqUKqeUciHojYDDPTC5KQh5m2PBv4I4iIR
LnKOqNUX7UCqbdaE/tfFRG0CAwEAAQ==
-----END PUBLIC KEY-----
''; '';
}; };
}; };

8
lass/1systems/prism/config.nix
View File

@ -396,12 +396,12 @@ with import <stockholm/lib>;
]; ];
} }
{ {
nix.trustedUsers = [ "Mic92" ]; nix.trustedUsers = [ "mic92" ];
users.users.Mic92 = { users.users.mic92 = {
uid = genid_uint31 "Mic92"; uid = genid_uint31 "mic92";
isNormalUser = true; isNormalUser = true;
openssh.authorizedKeys.keys = [ openssh.authorizedKeys.keys = [
config.krebs.users.Mic92.pubkey config.krebs.users.mic92.pubkey
]; ];
}; };
} }