3 krebs: put imps into user namespaces
This commit is contained in:
tv
parent
7e43b2cc3e
commit
85077a0cde
|
|
@ -13,14 +13,7 @@ let
|
||||||
./urlwatch.nix
|
./urlwatch.nix
|
||||||
];
|
];
|
||||||
options.krebs = api;
|
options.krebs = api;
|
||||||
config = mkIf cfg.enable (mkMerge [
|
config = mkIf cfg.enable imp;
|
||||||
{ krebs.hosts = lass-hosts; }
|
|
||||||
{ krebs.hosts = makefu-hosts; }
|
|
||||||
{ krebs.hosts = tv-hosts; }
|
|
||||||
{ krebs.users = lass-users; }
|
|
||||||
{ krebs.users = makefu-users; }
|
|
||||||
{ krebs.users = tv-users; }
|
|
||||||
]);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
api = {
|
api = {
|
||||||
|
|
@ -35,181 +28,193 @@ let
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
lass-hosts = addNames {
|
imp = mkMerge [
|
||||||
};
|
{ krebs = lass-imp; }
|
||||||
lass-users = addNames {
|
{ krebs = makefu-imp; }
|
||||||
lass = {
|
{ krebs = tv-imp; }
|
||||||
pubkey = readFile ../../Zpubkeys/lass.ssh.pub;
|
];
|
||||||
|
|
||||||
|
lass-imp = {
|
||||||
|
hosts = addNames {
|
||||||
};
|
};
|
||||||
uriel = {
|
users = addNames {
|
||||||
pubkey = readFile ../../Zpubkeys/uriel.ssh.pub;
|
lass = {
|
||||||
|
pubkey = readFile ../../Zpubkeys/lass.ssh.pub;
|
||||||
|
};
|
||||||
|
uriel = {
|
||||||
|
pubkey = readFile ../../Zpubkeys/uriel.ssh.pub;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
makefu-hosts = addNames {
|
makefu-imp = {
|
||||||
};
|
hosts = addNames {
|
||||||
makefu-users = addNames {
|
};
|
||||||
makefu = {
|
users = addNames {
|
||||||
pubkey = readFile ../../Zpubkeys/makefu.ssh.pub;
|
makefu = {
|
||||||
|
pubkey = readFile ../../Zpubkeys/makefu.ssh.pub;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
tv-hosts = addNames {
|
tv-imp = {
|
||||||
cd = {
|
hosts = addNames {
|
||||||
cores = 2;
|
cd = {
|
||||||
dc = "tv"; #dc = "cac";
|
cores = 2;
|
||||||
nets = rec {
|
dc = "tv"; #dc = "cac";
|
||||||
internet = {
|
nets = rec {
|
||||||
addrs4 = ["162.219.7.216"];
|
internet = {
|
||||||
aliases = [
|
addrs4 = ["162.219.7.216"];
|
||||||
"cd.internet"
|
aliases = [
|
||||||
"cd.viljetic.de"
|
"cd.internet"
|
||||||
"cgit.cd.viljetic.de"
|
"cd.viljetic.de"
|
||||||
"cd.krebsco.de"
|
"cgit.cd.viljetic.de"
|
||||||
];
|
"cd.krebsco.de"
|
||||||
};
|
];
|
||||||
retiolum = {
|
};
|
||||||
via = internet;
|
retiolum = {
|
||||||
addrs4 = ["10.243.113.222"];
|
via = internet;
|
||||||
addrs6 = ["42:4522:25f8:36bb:8ccb:0150:231a:2af3"];
|
addrs4 = ["10.243.113.222"];
|
||||||
aliases = [
|
addrs6 = ["42:4522:25f8:36bb:8ccb:0150:231a:2af3"];
|
||||||
"cd.retiolum"
|
aliases = [
|
||||||
"cgit.cd.retiolum"
|
"cd.retiolum"
|
||||||
];
|
"cgit.cd.retiolum"
|
||||||
tinc.pubkey = ''
|
];
|
||||||
-----BEGIN RSA PUBLIC KEY-----
|
tinc.pubkey = ''
|
||||||
MIICCgKCAgEAvmCBVNKT/Su4v9nl/Nm3STPo5QxWPg7xEkzIs3Oh39BS8+r6/7UQ
|
-----BEGIN RSA PUBLIC KEY-----
|
||||||
rebib7mczb+ebZd+Rg2yFoGrWO8cmM0VcLy5bYRMK7in8XroLEjWecNNM4TRfNR4
|
MIICCgKCAgEAvmCBVNKT/Su4v9nl/Nm3STPo5QxWPg7xEkzIs3Oh39BS8+r6/7UQ
|
||||||
e53+LhcPdkxo0A3/D+yiut+A2Mkqe+4VXDm/JhAiAYkZTn7jUtj00Atrc7CWW1gN
|
rebib7mczb+ebZd+Rg2yFoGrWO8cmM0VcLy5bYRMK7in8XroLEjWecNNM4TRfNR4
|
||||||
sP3jIgv4+CGftdSYOB4dm699B7OD9XDLci2kOaFqFl4cjDYUok03G0AduUlRx10v
|
e53+LhcPdkxo0A3/D+yiut+A2Mkqe+4VXDm/JhAiAYkZTn7jUtj00Atrc7CWW1gN
|
||||||
CKbKOTIdm8C36A902/3ms+Hyzkruu+VagGIZuPSwqXHJPCu7Ju+jarKQstMmpQi0
|
sP3jIgv4+CGftdSYOB4dm699B7OD9XDLci2kOaFqFl4cjDYUok03G0AduUlRx10v
|
||||||
PubweWDL0o/Dfz2qT3DuL4xDecIvGE6kv3m41hHJYiK+2/azTSehyPFbsVbL7w0V
|
CKbKOTIdm8C36A902/3ms+Hyzkruu+VagGIZuPSwqXHJPCu7Ju+jarKQstMmpQi0
|
||||||
LgKN3usnZNcpTsBWxRGT7nMFSnX2FLDu7d9OfCuaXYxHVFLZaNrpccOq8NF/7Hbk
|
PubweWDL0o/Dfz2qT3DuL4xDecIvGE6kv3m41hHJYiK+2/azTSehyPFbsVbL7w0V
|
||||||
DDW81W7CvLyJDlp0WLnAawSOGTUTPoYv/2wAapJ89i8QGCueGvEc6o2EcnBVMFEW
|
LgKN3usnZNcpTsBWxRGT7nMFSnX2FLDu7d9OfCuaXYxHVFLZaNrpccOq8NF/7Hbk
|
||||||
ejWTQzyD816f4RsplnrRqLVlIMbr9Q/n5TvlgjjhX7IMEfMy4+7qLGRQkNbFzgwK
|
DDW81W7CvLyJDlp0WLnAawSOGTUTPoYv/2wAapJ89i8QGCueGvEc6o2EcnBVMFEW
|
||||||
jxNG2fFSCjOEQitm0gAtx7QRIyvYr6c7/xiHz4AwxYzBmvQsL/OK57NO4+Krwgj5
|
ejWTQzyD816f4RsplnrRqLVlIMbr9Q/n5TvlgjjhX7IMEfMy4+7qLGRQkNbFzgwK
|
||||||
Vk8TQ2jGO7J4bB38zaxK+Lrtfl8i1AK1171JqFMhOc34JSJ7T4LWDMECAwEAAQ==
|
jxNG2fFSCjOEQitm0gAtx7QRIyvYr6c7/xiHz4AwxYzBmvQsL/OK57NO4+Krwgj5
|
||||||
-----END RSA PUBLIC KEY-----
|
Vk8TQ2jGO7J4bB38zaxK+Lrtfl8i1AK1171JqFMhOc34JSJ7T4LWDMECAwEAAQ==
|
||||||
'';
|
-----END RSA PUBLIC KEY-----
|
||||||
|
'';
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
mkdir = {
|
||||||
mkdir = {
|
cores = 1;
|
||||||
cores = 1;
|
dc = "tv"; #dc = "cac";
|
||||||
dc = "tv"; #dc = "cac";
|
nets = rec {
|
||||||
nets = rec {
|
internet = {
|
||||||
internet = {
|
addrs4 = ["162.248.167.241"];
|
||||||
addrs4 = ["162.248.167.241"];
|
aliases = [
|
||||||
aliases = [
|
"mkdir.internet"
|
||||||
"mkdir.internet"
|
];
|
||||||
];
|
};
|
||||||
};
|
retiolum = {
|
||||||
retiolum = {
|
via = internet;
|
||||||
via = internet;
|
addrs4 = ["10.243.113.223"];
|
||||||
addrs4 = ["10.243.113.223"];
|
addrs6 = ["42:4522:25f8:36bb:8ccb:0150:231a:2af4"];
|
||||||
addrs6 = ["42:4522:25f8:36bb:8ccb:0150:231a:2af4"];
|
aliases = [
|
||||||
aliases = [
|
"mkdir.retiolum"
|
||||||
"mkdir.retiolum"
|
"cgit.mkdir.retiolum"
|
||||||
"cgit.mkdir.retiolum"
|
];
|
||||||
];
|
tinc.pubkey = ''
|
||||||
tinc.pubkey = ''
|
-----BEGIN RSA PUBLIC KEY-----
|
||||||
-----BEGIN RSA PUBLIC KEY-----
|
MIIBCgKCAQEAuyfM+3od75zOYXqnqRMAt+yp/4z/vC3vSWdjUvEmCuM23c5BOBw+
|
||||||
MIIBCgKCAQEAuyfM+3od75zOYXqnqRMAt+yp/4z/vC3vSWdjUvEmCuM23c5BOBw+
|
dKqbWoSPTzOuaQ0szdL7a6YxT+poSUXd/i3pPz59KgCl192rd1pZoJKgvoluITev
|
||||||
dKqbWoSPTzOuaQ0szdL7a6YxT+poSUXd/i3pPz59KgCl192rd1pZoJKgvoluITev
|
voYSP9rFQOUrustfDb9qKW/ZY95cwdCvypo7Vf4ghxwDCnlmyCGz7qXTJMLydNKF
|
||||||
voYSP9rFQOUrustfDb9qKW/ZY95cwdCvypo7Vf4ghxwDCnlmyCGz7qXTJMLydNKF
|
2PH9KiY4suv15sCg/zisu+q0ZYQXUc1TcgpoIYBOftDunOJoNdbti+XjwWdjGmJZ
|
||||||
2PH9KiY4suv15sCg/zisu+q0ZYQXUc1TcgpoIYBOftDunOJoNdbti+XjwWdjGmJZ
|
Bn4GelsrrpwJFvfDmouHUe8GsD7nTgbZFtiJbKfCEiK16N0Q0d0ZFHhAV2nPjsk2
|
||||||
Bn4GelsrrpwJFvfDmouHUe8GsD7nTgbZFtiJbKfCEiK16N0Q0d0ZFHhAV2nPjsk2
|
3JhG4n9vxATBkO82f7RLrcrhkx9cbLfN3wIDAQAB
|
||||||
3JhG4n9vxATBkO82f7RLrcrhkx9cbLfN3wIDAQAB
|
-----END RSA PUBLIC KEY-----
|
||||||
-----END RSA PUBLIC KEY-----
|
'';
|
||||||
'';
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
nomic = {
|
||||||
nomic = {
|
cores = 2;
|
||||||
cores = 2;
|
dc = "tv"; #dc = "gg23";
|
||||||
dc = "tv"; #dc = "gg23";
|
nets = rec {
|
||||||
nets = rec {
|
retiolum = {
|
||||||
retiolum = {
|
addrs4 = ["10.243.0.110"];
|
||||||
addrs4 = ["10.243.0.110"];
|
addrs6 = ["42:02d5:733f:d6da:c0f5:2bb7:2b18:09ec"];
|
||||||
addrs6 = ["42:02d5:733f:d6da:c0f5:2bb7:2b18:09ec"];
|
aliases = [
|
||||||
aliases = [
|
"nomic.retiolum"
|
||||||
"nomic.retiolum"
|
"cgit.nomic.retiolum"
|
||||||
"cgit.nomic.retiolum"
|
];
|
||||||
];
|
tinc.pubkey = ''
|
||||||
tinc.pubkey = ''
|
-----BEGIN RSA PUBLIC KEY-----
|
||||||
-----BEGIN RSA PUBLIC KEY-----
|
MIIBCgKCAQEAwb8Yk/YRc17g2J9n960p6j4W/l559OPyuMPdGJ4DmCm3WNQtxoa+
|
||||||
MIIBCgKCAQEAwb8Yk/YRc17g2J9n960p6j4W/l559OPyuMPdGJ4DmCm3WNQtxoa+
|
qTFUiDiI85BcmfqnSeddLG8zTC2XnSlIvCRMJ9oKzppFM4PX4OTAaJZVE5WyCQhw
|
||||||
qTFUiDiI85BcmfqnSeddLG8zTC2XnSlIvCRMJ9oKzppFM4PX4OTAaJZVE5WyCQhw
|
Kd4tHVdoQgJW5yFepmT9IUmHqkxXJ0R2W93l2eSZNOcnFvFn0ooiAlRi4zAiHClu
|
||||||
Kd4tHVdoQgJW5yFepmT9IUmHqkxXJ0R2W93l2eSZNOcnFvFn0ooiAlRi4zAiHClu
|
5Mz80Sc2rvez+n9wtC2D06aYjP23pHYld2xighHR9SUqX1dFzgSXNSoWWCcgNp2a
|
||||||
5Mz80Sc2rvez+n9wtC2D06aYjP23pHYld2xighHR9SUqX1dFzgSXNSoWWCcgNp2a
|
OKcM8LzxLV7MTMZFOJCJndZ77e4LsUvxhQFP6nyKZWg30PC0zufZsuN5o2xsWSlA
|
||||||
OKcM8LzxLV7MTMZFOJCJndZ77e4LsUvxhQFP6nyKZWg30PC0zufZsuN5o2xsWSlA
|
Wi9sMB1AUR6mZrxgcgTFpUjbjbLQf+36CwIDAQAB
|
||||||
Wi9sMB1AUR6mZrxgcgTFpUjbjbLQf+36CwIDAQAB
|
-----END RSA PUBLIC KEY-----
|
||||||
-----END RSA PUBLIC KEY-----
|
'';
|
||||||
'';
|
};
|
||||||
|
};
|
||||||
|
secure = true;
|
||||||
|
};
|
||||||
|
rmdir = {
|
||||||
|
cores = 1;
|
||||||
|
dc = "tv"; #dc = "cac";
|
||||||
|
nets = rec {
|
||||||
|
internet = {
|
||||||
|
addrs4 = ["167.88.44.94"];
|
||||||
|
aliases = [
|
||||||
|
"rmdir.internet"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
retiolum = {
|
||||||
|
via = internet;
|
||||||
|
addrs4 = ["10.243.113.224"];
|
||||||
|
addrs6 = ["42:4522:25f8:36bb:8ccb:0150:231a:2af5"];
|
||||||
|
aliases = [
|
||||||
|
"rmdir.retiolum"
|
||||||
|
"cgit.rmdir.retiolum"
|
||||||
|
];
|
||||||
|
tinc.pubkey = ''
|
||||||
|
-----BEGIN RSA PUBLIC KEY-----
|
||||||
|
MIIBCgKCAQEA+twy4obSbJdmZLfBoe9YYeyoDnXkO/WPa2D6Eh6jXrWk5fbhBjRf
|
||||||
|
i3EAQfLiXXFJX3E8V8YvJyazXklI19jJtCLDiu/F5kgJJfyAkWHH+a/hcg7qllDM
|
||||||
|
Xx2CvS/nCbs+p48/VLO6zLC7b1oHu3K/ob5M5bwPK6j9NEDIL5qYiM5PQzV6zryz
|
||||||
|
hS9E/+l8Z+UUpYcfS3bRovXJAerB4txc/gD3Xmptq1zk53yn1kJFYfVlwyyz+NEF
|
||||||
|
59JZj2PDrvWoG0kx/QjiNurs6XfdnyHe/gP3rmSTrihKFVuA3cZM62sDR4FcaeWH
|
||||||
|
SnKSp02pqjBOjC/dOK97nXpKLJgNH046owIDAQAB
|
||||||
|
-----END RSA PUBLIC KEY-----
|
||||||
|
'';
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
secure = true;
|
wu = {
|
||||||
};
|
cores = 4;
|
||||||
rmdir = {
|
# TODO wu is mobile, so dc means "home data center"
|
||||||
cores = 1;
|
dc = "tv"; #dc = "gg23";
|
||||||
dc = "tv"; #dc = "cac";
|
nets = {
|
||||||
nets = rec {
|
retiolum = {
|
||||||
internet = {
|
addrs4 = ["10.243.13.37"];
|
||||||
addrs4 = ["167.88.44.94"];
|
addrs6 = ["42:0:0:0:0:0:0:1337"];
|
||||||
aliases = [
|
aliases = [
|
||||||
"rmdir.internet"
|
"wu.retiolum"
|
||||||
];
|
];
|
||||||
};
|
tinc.pubkey = ''
|
||||||
retiolum = {
|
-----BEGIN RSA PUBLIC KEY-----
|
||||||
via = internet;
|
MIIBCgKCAQEArDvU0cuBsVqTjCX2TlWL4XHSy4qSjUhjrDvUPZSKTVN7x6OENCUn
|
||||||
addrs4 = ["10.243.113.224"];
|
M27g9H7j4/Jw/8IHoJLiKnXHavOoc9UJM+P9Fla/4TTVADr69UDSnLgH+wGiHcEg
|
||||||
addrs6 = ["42:4522:25f8:36bb:8ccb:0150:231a:2af5"];
|
GxPkb2jt0Z8zcpD6Fusj1ATs3sssaLHTHvg1D0LylEWA3cI4WPP13v23PkyUENQT
|
||||||
aliases = [
|
KpSWfR+obqDl38Q7LuFi6dH9ruyvqK+4syddrBwjPXrcNxcGL9QbDn7+foRNiWw4
|
||||||
"rmdir.retiolum"
|
4CE5z25oGG2iWMShI7fe3ji/fMUAl7DSOOrHVVG9eMtpzy+uI8veOHrdTax4oKik
|
||||||
"cgit.rmdir.retiolum"
|
AFGCrMIov3F0GIeu3nDlrTIZPZDTodbFKQIDAQAB
|
||||||
];
|
-----END RSA PUBLIC KEY-----
|
||||||
tinc.pubkey = ''
|
'';
|
||||||
-----BEGIN RSA PUBLIC KEY-----
|
};
|
||||||
MIIBCgKCAQEA+twy4obSbJdmZLfBoe9YYeyoDnXkO/WPa2D6Eh6jXrWk5fbhBjRf
|
|
||||||
i3EAQfLiXXFJX3E8V8YvJyazXklI19jJtCLDiu/F5kgJJfyAkWHH+a/hcg7qllDM
|
|
||||||
Xx2CvS/nCbs+p48/VLO6zLC7b1oHu3K/ob5M5bwPK6j9NEDIL5qYiM5PQzV6zryz
|
|
||||||
hS9E/+l8Z+UUpYcfS3bRovXJAerB4txc/gD3Xmptq1zk53yn1kJFYfVlwyyz+NEF
|
|
||||||
59JZj2PDrvWoG0kx/QjiNurs6XfdnyHe/gP3rmSTrihKFVuA3cZM62sDR4FcaeWH
|
|
||||||
SnKSp02pqjBOjC/dOK97nXpKLJgNH046owIDAQAB
|
|
||||||
-----END RSA PUBLIC KEY-----
|
|
||||||
'';
|
|
||||||
};
|
};
|
||||||
|
secure = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
wu = {
|
users = addNames {
|
||||||
cores = 4;
|
tv = {
|
||||||
# TODO wu is mobile, so dc means "home data center"
|
pubkey = readFile ../../Zpubkeys/tv_wu.ssh.pub;
|
||||||
dc = "tv"; #dc = "gg23";
|
|
||||||
nets = {
|
|
||||||
retiolum = {
|
|
||||||
addrs4 = ["10.243.13.37"];
|
|
||||||
addrs6 = ["42:0:0:0:0:0:0:1337"];
|
|
||||||
aliases = [
|
|
||||||
"wu.retiolum"
|
|
||||||
];
|
|
||||||
tinc.pubkey = ''
|
|
||||||
-----BEGIN RSA PUBLIC KEY-----
|
|
||||||
MIIBCgKCAQEArDvU0cuBsVqTjCX2TlWL4XHSy4qSjUhjrDvUPZSKTVN7x6OENCUn
|
|
||||||
M27g9H7j4/Jw/8IHoJLiKnXHavOoc9UJM+P9Fla/4TTVADr69UDSnLgH+wGiHcEg
|
|
||||||
GxPkb2jt0Z8zcpD6Fusj1ATs3sssaLHTHvg1D0LylEWA3cI4WPP13v23PkyUENQT
|
|
||||||
KpSWfR+obqDl38Q7LuFi6dH9ruyvqK+4syddrBwjPXrcNxcGL9QbDn7+foRNiWw4
|
|
||||||
4CE5z25oGG2iWMShI7fe3ji/fMUAl7DSOOrHVVG9eMtpzy+uI8veOHrdTax4oKik
|
|
||||||
AFGCrMIov3F0GIeu3nDlrTIZPZDTodbFKQIDAQAB
|
|
||||||
-----END RSA PUBLIC KEY-----
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
secure = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
tv-users = addNames {
|
|
||||||
tv = {
|
|
||||||
pubkey = readFile ../../Zpubkeys/tv_wu.ssh.pub;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user