Compare commits
2 Commits
2b5a5f2c21
...
cbcd46d300
Author | SHA1 | Date |
---|---|---|
Astro | cbcd46d300 | |
Astro | 52eff5833d |
83
flake.lock
83
flake.lock
|
@ -336,6 +336,29 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"naersk_2": {
|
"naersk_2": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"skyflake",
|
||||||
|
"nix-cache-cut",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1671096816,
|
||||||
|
"narHash": "sha256-ezQCsNgmpUHdZANDCILm3RvtO1xH8uujk/+EqNvzIOg=",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "naersk",
|
||||||
|
"rev": "d998160d6a076cfe8f9741e56aeec7e267e3e114",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-community",
|
||||||
|
"ref": "master",
|
||||||
|
"repo": "naersk",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"naersk_3": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"ticker",
|
"ticker",
|
||||||
|
@ -357,6 +380,26 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nix-cache-cut": {
|
||||||
|
"inputs": {
|
||||||
|
"naersk": "naersk_2",
|
||||||
|
"nixpkgs": "nixpkgs",
|
||||||
|
"utils": "utils"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1677107143,
|
||||||
|
"narHash": "sha256-7JCxZgGFeHdOTkIOsV8vsOi3FMXHO5Yn8HnzunIeM/A=",
|
||||||
|
"owner": "astro",
|
||||||
|
"repo": "nix-cache-cut",
|
||||||
|
"rev": "a69adffc2a0f5216465e5fb718b8e4ca1fc54dde",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "astro",
|
||||||
|
"repo": "nix-cache-cut",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixos": {
|
"nixos": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1684533630,
|
"lastModified": 1684533630,
|
||||||
|
@ -408,6 +451,22 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixpkgs": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1676790509,
|
||||||
|
"narHash": "sha256-W9uWAWokgS8US8rJf79qBLS2M+ZgIscfoz+KsNE7VGQ=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "a1291d0d020a200c7ce3c48e96090bfa4890a475",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixpkgs-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"oparl-scraper": {
|
"oparl-scraper": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
|
@ -575,16 +634,17 @@
|
||||||
"microvm": [
|
"microvm": [
|
||||||
"microvm"
|
"microvm"
|
||||||
],
|
],
|
||||||
|
"nix-cache-cut": "nix-cache-cut",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixos"
|
"nixos"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1684527692,
|
"lastModified": 1684708973,
|
||||||
"narHash": "sha256-5OAH7ZU5wfijd+m8is88quSxjygK1yAuk0zDlfWrpYw=",
|
"narHash": "sha256-043T2U3frUkTUeTMVEKIa90Vowij4v3xsugR30Z4vOc=",
|
||||||
"owner": "astro",
|
"owner": "astro",
|
||||||
"repo": "skyflake",
|
"repo": "skyflake",
|
||||||
"rev": "3d7a12f06a4249c73678f293f3004b968d043291",
|
"rev": "418cd805973a8d15bdd6b0f4204b6ad2fc436326",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -682,7 +742,7 @@
|
||||||
"fenix": [
|
"fenix": [
|
||||||
"fenix"
|
"fenix"
|
||||||
],
|
],
|
||||||
"naersk": "naersk_2",
|
"naersk": "naersk_3",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixos"
|
"nixos"
|
||||||
],
|
],
|
||||||
|
@ -746,6 +806,21 @@
|
||||||
"url": "https://gitea.c3d2.de/astro/tracer"
|
"url": "https://gitea.c3d2.de/astro/tracer"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"utils": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1676283394,
|
||||||
|
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"yammat": {
|
"yammat": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
|
|
@ -16,6 +16,9 @@ let
|
||||||
then net
|
then net
|
||||||
else result
|
else result
|
||||||
) null [ "cluster" "serv" ];
|
) null [ "cluster" "serv" ];
|
||||||
|
|
||||||
|
skyflakeHome = "/var/lib/skyflake/home";
|
||||||
|
|
||||||
in {
|
in {
|
||||||
# Open firewall between cluster members
|
# Open firewall between cluster members
|
||||||
networking.firewall.extraCommands = lib.concatMapStrings
|
networking.firewall.extraCommands = lib.concatMapStrings
|
||||||
|
@ -59,15 +62,18 @@ in {
|
||||||
c3d2 = {
|
c3d2 = {
|
||||||
uid = 1001;
|
uid = 1001;
|
||||||
sshKeys = config.users.users.root.openssh.authorizedKeys.keys;
|
sshKeys = config.users.users.root.openssh.authorizedKeys.keys;
|
||||||
|
home = "${skyflakeHome}/c3d2";
|
||||||
};
|
};
|
||||||
# Deployment user for leon who also uses this flake
|
# Deployment user for leon who also uses this flake
|
||||||
leon = {
|
leon = {
|
||||||
uid = 1002;
|
uid = 1002;
|
||||||
sshKeys = with ssh-public-keys; leon ++ astro;
|
sshKeys = with ssh-public-keys; leon ++ astro;
|
||||||
|
home = "${skyflakeHome}/leon";
|
||||||
};
|
};
|
||||||
# Deployment user for neighbour Andreas Lippmann <andreaslippmann@web.de>
|
# Deployment user for neighbour Andreas Lippmann <andreaslippmann@web.de>
|
||||||
luulaatsch = {
|
luulaatsch = {
|
||||||
uid = 1003;
|
uid = 1003;
|
||||||
|
home = "${skyflakeHome}/luulaatsch";
|
||||||
sshKeys = [
|
sshKeys = [
|
||||||
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDVipwWSzxgUgm0fMeTbOSCXDNkbUUp+k1tvWaJcBA1M+LTM21rhP3tQQP24smPx1b2V/by6vHakhsj5pIMLzSSW7he/mAnOtwHj2dCEk6VaMvozAfS6n777g8ujZg0N9ekrqoNLh0uNchs3DYFZWXAnKtfEYjzIdXqVgXMI4uDXM6ObEh+YR3iGaZSYKd6S5nufzJOR6EiYbv/z6ThRq16f+HqetVdBamqmpNK9NcWCtjMcww7nZTyUvTbd2AyrpTAXSnVg30fza428Kpc5ZdzDJFjn0B3MVnP2LavIo8VH3Y5sjpp0aMDKfbz6dPA/df/pR6LVMsxx0eCEXeGqo9sFdabu2AwIPi79QFANr3qJ/nZo2LR3o2LvcOLO06xVRFKReGTsy6WWTNOTAL03sdiIbqnlmkjXu5nb4hzxoHBgA6LZGMx3knoVcUMBlpVaxOoT2tzXzpYszsKpGSN1EBqUlDXzen3EkHg7TpjjTJSH7Q0AeeSCJsaoAepa6wcZeJlBWSRiJdqIn7YBmCBdjV1nNPVBYE5mm2x88ha9e4NbyFhjQvZ/BiLyKCFVyDs6lIvhV5QfAPWOkyPwbLXtXg6g1OvmuM6mGDhtEfZKvreeqmTKjB+x7OpG847JKxmU8eeYax63/WgRssbOfTpicjsdoKlFST3WpZHGT7mWzmB/w== andreas@luulaatschs-MBP.pub.zentralwerk.org"
|
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDVipwWSzxgUgm0fMeTbOSCXDNkbUUp+k1tvWaJcBA1M+LTM21rhP3tQQP24smPx1b2V/by6vHakhsj5pIMLzSSW7he/mAnOtwHj2dCEk6VaMvozAfS6n777g8ujZg0N9ekrqoNLh0uNchs3DYFZWXAnKtfEYjzIdXqVgXMI4uDXM6ObEh+YR3iGaZSYKd6S5nufzJOR6EiYbv/z6ThRq16f+HqetVdBamqmpNK9NcWCtjMcww7nZTyUvTbd2AyrpTAXSnVg30fza428Kpc5ZdzDJFjn0B3MVnP2LavIo8VH3Y5sjpp0aMDKfbz6dPA/df/pR6LVMsxx0eCEXeGqo9sFdabu2AwIPi79QFANr3qJ/nZo2LR3o2LvcOLO06xVRFKReGTsy6WWTNOTAL03sdiIbqnlmkjXu5nb4hzxoHBgA6LZGMx3knoVcUMBlpVaxOoT2tzXzpYszsKpGSN1EBqUlDXzen3EkHg7TpjjTJSH7Q0AeeSCJsaoAepa6wcZeJlBWSRiJdqIn7YBmCBdjV1nNPVBYE5mm2x88ha9e4NbyFhjQvZ/BiLyKCFVyDs6lIvhV5QfAPWOkyPwbLXtXg6g1OvmuM6mGDhtEfZKvreeqmTKjB+x7OpG847JKxmU8eeYax63/WgRssbOfTpicjsdoKlFST3WpZHGT7mWzmB/w== andreas@luulaatschs-MBP.pub.zentralwerk.org"
|
||||||
] ++ ssh-public-keys.astro;
|
] ++ ssh-public-keys.astro;
|
||||||
|
@ -76,6 +82,7 @@ in {
|
||||||
marenz = {
|
marenz = {
|
||||||
uid = 1004;
|
uid = 1004;
|
||||||
sshKeys = ssh-public-keys.marenz;
|
sshKeys = ssh-public-keys.marenz;
|
||||||
|
home = "${skyflakeHome}/marenz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -84,12 +91,15 @@ in {
|
||||||
# Ceph storage cluster configuration
|
# Ceph storage cluster configuration
|
||||||
storage.ceph = assert lib.versions.majorMinor pkgs.ceph.version == "16.2"; rec {
|
storage.ceph = assert lib.versions.majorMinor pkgs.ceph.version == "16.2"; rec {
|
||||||
fsid = "a06b1061-ef09-46d6-a15f-2f8ce4d7d1bf";
|
fsid = "a06b1061-ef09-46d6-a15f-2f8ce4d7d1bf";
|
||||||
mons = [ "server8" "server9" "server10" ];
|
mons = [ "server7" "server8" "server9" "server10" ];
|
||||||
mgrs = mons;
|
mgrs = mons;
|
||||||
mdss = mons;
|
mdss = mons;
|
||||||
rbdPools.microvms = {
|
rbdPools.microvms = {
|
||||||
params = { size = 2; class = "ssd"; };
|
params = { size = 2; class = "ssd"; };
|
||||||
};
|
};
|
||||||
|
cephfs.home.mountPoint = skyflakeHome;
|
||||||
|
# Legacy: migration to rbd
|
||||||
|
cephfs.skyflake.mountPoint = "/storage/cephfs";
|
||||||
|
|
||||||
monKeyring = config.sops.secrets."ceph/monKeyring".path;
|
monKeyring = config.sops.secrets."ceph/monKeyring".path;
|
||||||
adminKeyring = config.sops.secrets."ceph/adminKeyring".path;
|
adminKeyring = config.sops.secrets."ceph/adminKeyring".path;
|
||||||
|
|
Loading…
Reference in New Issue