moritz/clan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: moritz:47855697be9ac1ff468e933fe80c352b19aeb3c7
Branches Tags
moritz:main
...
compare: moritz:fee79c889353ddf368fc5fdba54514f0c5602ac5
Branches Tags
moritz:main

2 commits
47855697be ... fee79c8893

Author SHA1 Message Date
Moritz Böhme
fee79c8893
feat: add connection timeout of 1s for remote builders 2025-04-21 11:34:02 +02:00
Moritz Böhme
74c0c039f1
Update vars via generator remotebuild for machine moritz-laptop 2025-04-21 10:56:45 +02:00
6 changed files with 24 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
clanServices/remote-builders/default.nix
View file

@ -136,6 +136,7 @@
mkMatch = name: _value: '' mkMatch = name: _value: ''
Match User remotebuild Host ${name} Match User remotebuild Host ${name}
IdentityFile ${config.clan.core.vars.generators.remotebuild.files."ssh.id_ed25519".path} IdentityFile ${config.clan.core.vars.generators.remotebuild.files."ssh.id_ed25519".path}
ConnectTimeout 1
''; '';
sshConfig = concatLines (mapAttrsToList mkMatch others); sshConfig = concatLines (mapAttrsToList mkMatch others);
in { in {

2
flake.nix
View file

@ -101,7 +101,7 @@
inventory = { inventory = {
machines = { machines = {
moritz-desktop.tags = ["peer" "client" "worker"]; moritz-desktop.tags = ["peer" "client" "worker"];
moritz-laptop.tags = ["peer"]; moritz-laptop.tags = ["peer" "client" "worker"];
moritz-server.tags = ["client" "worker"]; moritz-server.tags = ["client" "worker"];
}; };
instances."remote-builders" = { instances."remote-builders" = {

1
vars/per-machine/moritz-laptop/remotebuild/ssh.id_ed25519.pub/value Normal file
View file

@ -0,0 +1 @@
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB54huDhPJcgD/a2YF3Cpd6vvFfXKOykehJSyJ2xBkwe nixbld@moritz-laptop

1
vars/per-machine/moritz-laptop/remotebuild/ssh.id_ed25519/machines/moritz-laptop Symbolic link
View file

@ -0,0 +1 @@
../../../../../../sops/machines/moritz-laptop

19
vars/per-machine/moritz-laptop/remotebuild/ssh.id_ed25519/secret Normal file
View file

@ -0,0 +1,19 @@
{
"data": "ENC[AES256_GCM,data:K3RZVlCygYU3VQ2Iq3nxmd6+8BmXBX24xnmsszEBCQTQMm+je/GjsUQZljdwEqr593fMUEB5NvKh+u4mR0G8TXvcvl/xpppS1tGoZmAIxwrt9yZ1p0O3fYRyVt0CzQ/Sl4GFjgcbP8AzWIYXwLhL5Q8tTnvLinSXsU1K2B0H406biFU6ps5rUt7dKPsGcdXC/pQ7AnmCWifeFmhZSOUP05W/k07rCqo0lz3h+XNfRkaWkSw4pAhUwTHxyP79on0LZXWjP+2VTJPIlJa/myEC8oLNthg/N4yuvVLP7dLyngAnnuZOiswYVp3nc7PbINRuZZwZ6ayVtN7seGp+wmczyZlTKM/ebIp8ZktTm4HNeHblj/OtUMaACiUP2wPgjmLcfr/ZXj3NadiD35IhgLOZk9qKldbu3ncsmiLKyq+9jNFOI9TbHwg3hvEf4asuTJZfb7w3oTBQNrl5MoQPmM04jcpMFlJavcSRKjq0uQ/uJ2wsNMhsmc06JLh1o1BGyyPWc7AbNo/k6XHJH2gsRnTPDbA78oNsBxNRzFF4,iv:6Zct3dC7Z69b/khv0aOvKPZpj+IlKW/nlCIuLA33T9Q=,tag:mTvCN3GPAOMo0TXzx2rX5w==,type:str]",
"sops": {
"age": [
{
"recipient": "age12jlzcjwwhtgws4ku4nemwknsps3a6um74kdpxfv9pzvgdlhufp8q08c0j7",
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBUcGQ3VGswaVJMVHpCSHRu\naFI2b1ozR0F0Ym9oRmYyZm9KSHFCWmNFdWhrCkhqTWZSQXB3aVdDVTVZMUZqV2lL\nOXVQTElkWFhrU29WaEtWOXl3eEJjdTQKLS0tIDBXU2JCY3A5QjloZFM4ZEFHaXl5\nZ0hESjRlMUxlMGQ5eHYrczBMVldPYncKZ4jfAOo7XlLgjp+D2XfXksuNP7nHZFH/\ndFXf8KwFgTAZYyVHdX44t+b5tAMwSdmM8VaL5uHsIcQ1OxBGnAiRUg==\n-----END AGE ENCRYPTED FILE-----\n"
},
{
"recipient": "age1rgyueg2rnfw2er0rzkc6dc97p38fekjujdusfje6xn7g40plpfrshrlsyu",
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArYjNJYWhZcWJINVhLZGVN\nZHFRVUdQL2J0bWF0SjFNUnVLWlZBK2FGZld3ClZMLzNXREpwZENiaFJzZGVDZTd2\nZUkyZDN2Z3FpTzd5VEkwWHdWUlhrT00KLS0tIHNLTTBmWTY5NHhEUjVhdTc1NXJG\nZXMzNXp3ejhyTnUwUk1VRWdFU0VWenMKt4fQMOBQFQRVG/PTlUP92MzstZu5/jcx\nKwguvLj8G+rAB3zm3VcBigJ96HEqXSZDS+rNXfGFnT41XV/6PW9DZQ==\n-----END AGE ENCRYPTED FILE-----\n"
}
],
"lastmodified": "2025-04-21T08:56:45Z",
"mac": "ENC[AES256_GCM,data:kCKQOGiXOQ6rxqv8wau39qY4cW71O6qMXD5Pz46UJye2MusroSPUu4nYtYqi4bGGMv5t1Hay0XFTIwWAYlhtAKlC4sprgLHM83l+EpWs3JGk5crf4VcLTv7X+72QZjmQD76M7+wRTSM9JJh+OgGPHBdPn7SP6sEKe5mteBDgj3A=,iv:hRlfGyLiAolqIbCpnCJjb+lYbmHd2Xz9NJYc9HXsQWc=,tag:+3IWb8a9tPM8eazQytnOww==,type:str]",
"unencrypted_suffix": "_unencrypted",
"version": "3.10.1"
}
}

1
vars/per-machine/moritz-laptop/remotebuild/ssh.id_ed25519/users/moritz Symbolic link
View file

@ -0,0 +1 @@
../../../../../../sops/users/moritz