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

ma: tag managed hosts

Browse Source
This commit is contained in:
makefu 2017-07-23 20:54:13 +02:00
parent 4c2b481cbb
commit 200b973fa9
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
krebs/3modules/makefu/default.nix
View File

@ -6,6 +6,7 @@ with import <stockholm/lib>;
hosts = mapAttrs (_: setAttr "owner" config.krebs.users.makefu) { hosts = mapAttrs (_: setAttr "owner" config.krebs.users.makefu) {
drop = rec { drop = rec {
cores = 1; cores = 1;
managed = true;
nets = { nets = {
retiolum = { retiolum = {
ip4.addr = "10.243.177.9"; ip4.addr = "10.243.177.9";
@ -28,6 +29,7 @@ with import <stockholm/lib>;
}; };
studio = rec { studio = rec {
cores = 4; cores = 4;
managed = true;
ssh.privkey.path = <secrets/ssh_host_ed25519_key>; ssh.privkey.path = <secrets/ssh_host_ed25519_key>;
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIqBR5gjJkR1TEIs2yx6JRoIOA7+/LJA6kjju8yCauFa studio"; ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIqBR5gjJkR1TEIs2yx6JRoIOA7+/LJA6kjju8yCauFa studio";
nets = { nets = {
@ -53,6 +55,7 @@ with import <stockholm/lib>;
fileleech = rec { fileleech = rec {
cores = 4; cores = 4;
managed = true;
ssh.privkey.path = <secrets/ssh_host_ed25519_key>; ssh.privkey.path = <secrets/ssh_host_ed25519_key>;
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+jB5QdPsAJc90alYDhAEP3sPDJb6eIj9bebj+rTBEJ fileleech"; ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+jB5QdPsAJc90alYDhAEP3sPDJb6eIj9bebj+rTBEJ fileleech";
nets = { nets = {
@ -78,6 +81,7 @@ with import <stockholm/lib>;
pnp = { pnp = {
cores = 1; cores = 1;
managed = true;
nets = { nets = {
retiolum = { retiolum = {
ip4.addr = "10.243.0.210"; ip4.addr = "10.243.0.210";
@ -101,6 +105,7 @@ with import <stockholm/lib>;
}; };
darth = { darth = {
cores = 4; cores = 4;
managed = true;
nets = { nets = {
retiolum = { retiolum = {
ip4.addr = "10.243.0.84"; ip4.addr = "10.243.0.84";
@ -171,6 +176,7 @@ with import <stockholm/lib>;
}; };
}; };
tsp = { tsp = {
managed = true;
cores = 1; cores = 1;
nets = { nets = {
retiolum = { retiolum = {
@ -198,6 +204,7 @@ with import <stockholm/lib>;
}; };
}; };
x = { x = {
managed = true;
cores = 4; cores = 4;
nets = { nets = {
retiolum = { retiolum = {
@ -243,6 +250,7 @@ with import <stockholm/lib>;
vbob = { vbob = {
cores = 2; cores = 2;
managed = true;
nets = { nets = {
retiolum = { retiolum = {
ip4.addr = "10.243.1.91"; ip4.addr = "10.243.1.91";
@ -305,6 +313,7 @@ with import <stockholm/lib>;
}; };
wry = rec { wry = rec {
cores = 1; cores = 1;
managed = true;
extraZones = { extraZones = {
"krebsco.de" = '' "krebsco.de" = ''
wry IN A ${nets.internet.ip4.addr} wry IN A ${nets.internet.ip4.addr}
@ -349,6 +358,7 @@ with import <stockholm/lib>;
}; };
filepimp = rec { filepimp = rec {
cores = 1; cores = 1;
managed = true;
nets = { nets = {
lan = { lan = {
ip4.addr = "192.168.1.12"; ip4.addr = "192.168.1.12";
@ -378,6 +388,7 @@ with import <stockholm/lib>;
omo = rec { omo = rec {
cores = 2; cores = 2;
managed = true;
nets = { nets = {
lan = { lan = {
@ -411,6 +422,7 @@ with import <stockholm/lib>;
}; };
wbob = rec { wbob = rec {
cores = 4; cores = 4;
managed = true;
nets = { nets = {
siem = { siem = {
ip4.addr = "10.8.10.7"; ip4.addr = "10.8.10.7";
@ -452,6 +464,7 @@ with import <stockholm/lib>;
gum = rec { gum = rec {
cores = 2; cores = 2;
managed = true;
extraZones = { extraZones = {
"krebsco.de" = '' "krebsco.de" = ''
@ -514,6 +527,7 @@ with import <stockholm/lib>;
}; };
shoney = rec { shoney = rec {
cores = 1; cores = 1;
managed = true;
nets = rec { nets = rec {
siem = { siem = {
via = internet; via = internet;
@ -562,6 +576,7 @@ with import <stockholm/lib>;
}; };
sdev = rec { sdev = rec {
cores = 1; cores = 1;
managed = true;
ssh.privkey.path = <secrets/ssh_host_ed25519_key>; ssh.privkey.path = <secrets/ssh_host_ed25519_key>;
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILtm6ETzNgLcXNkrKs2VUEiGsTKBmOFpW2fazbzdUfOg sdev"; ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILtm6ETzNgLcXNkrKs2VUEiGsTKBmOFpW2fazbzdUfOg sdev";
nets = { nets = {

3
makefu/2configs/git/brain-retiolum.nix
View File

@ -8,6 +8,7 @@ let
krebs-repos = mapAttrs make-krebs-repo { krebs-repos = mapAttrs make-krebs-repo {
brain = { }; brain = { };
krebs-secrets = { };
}; };
@ -33,7 +34,7 @@ let
set-owners repo [ config.krebs.users.makefu ] ++ set-ro-access repo krebsminister; set-owners repo [ config.krebs.users.makefu ] ++ set-ro-access repo krebsminister;
set-ro-access = with git; repo: user: set-ro-access = with git; repo: user:
optional repo.public { singleton {
inherit user; inherit user;
repo = [ repo ]; repo = [ repo ];
perm = fetch; perm = fetch;