Merge branch 'main' into borgbackup
This commit is contained in:
@@ -69,6 +69,7 @@
|
||||
|
||||
base.userSSHKeys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINLKbBIwP+7DU6I7KSFYPK6+Pgx2DsTBPvTPS/gfCy4i etorres@xenon"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDaXlTEd1ysBs0ZgKo2UICwYEcTRopceiGilLxZEjFOU etorres@MacBook-Pro.t-family.internal"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB32obObhgnvQ7x4QFnlCsUP1Em0e+4nBP8ZZ/v7tTCy etorres@radon"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDaXlTEd1ysBs0ZgKo2UICwYEcTRopceiGilLxZEjFOU etorres@erics-mac"
|
||||
];
|
||||
}
|
||||
|
@@ -22,6 +22,7 @@
|
||||
|
||||
base.userSSHKeys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDyi9TFKaEVrO4Gl7/t47PERjOiN3WHMD29UgZV5gm4G etorres@xenon"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPWS4JI7h2B89m8bFT4CUzNmWViVy74CLDQXdhgxVnBk etorres@radon"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE3hrHq0AgKTJ3Pvu6/wC0LbroKbIMGbTNrWdCG/YIM/ etorres@erics-mac"
|
||||
];
|
||||
}
|
||||
|
@@ -19,6 +19,7 @@
|
||||
|
||||
base.userSSHKeys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDyi9TFKaEVrO4Gl7/t47PERjOiN3WHMD29UgZV5gm4G etorres@xenon"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPWS4JI7h2B89m8bFT4CUzNmWViVy74CLDQXdhgxVnBk etorres@radon"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE3hrHq0AgKTJ3Pvu6/wC0LbroKbIMGbTNrWdCG/YIM/ etorres@erics-mac"
|
||||
];
|
||||
}
|
||||
|
@@ -20,6 +20,7 @@
|
||||
|
||||
base.userSSHKeys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEXuLe99meMiylrJQKz8/WqgHQWA8aJ/IZL+1SAVs8n2 etorres@xenon"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPWS4JI7h2B89m8bFT4CUzNmWViVy74CLDQXdhgxVnBk etorres@radon"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPYYgxTbQTKrsR9DD0py/7j4xl3IoBSCzmRjRHuBjSGT etorres@erics-mac"
|
||||
];
|
||||
}
|
||||
|
@@ -17,6 +17,7 @@
|
||||
|
||||
base.userSSHKeys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICrUTAPCggSFmGKc2Yo9nXCwbHsQNkulWbicN5q1vldv etorres@xenon"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMpLYmsIyCd0EThQ8twuVjiE48SuSzVKxPFOlNMJCEE3 etorres@radon"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJzCOwNjrRdz8pbHp+MsdiTxpc+hTk3za78z90L4DK0U etorres@erics-mac"
|
||||
];
|
||||
}
|
||||
|
@@ -18,5 +18,6 @@
|
||||
base.userSSHKeys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF3oNF68M+TaN8LB+jQH9hFaW3vpR3i54UiVRPqJxyAN etorres@xenon"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIISjU0h15s29Ir6ANHNujlOO0/7+bGvkpbpN6WzVhgW6 etorres@radon"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIISjU0h15s29Ir6ANHNujlOO0/7+bGvkpbpN6WzVhgW6 etorres@radon"
|
||||
];
|
||||
}
|
||||
|
@@ -21,6 +21,7 @@
|
||||
|
||||
base.userSSHKeys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOQoGiE3hhfzbpW1UxrH7bgmP1Q5MDmFIvHq1IW2lb1f etorres@xenon"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIwmazLbH549WPEjEfe92HaqkpUaVo0+J3C/D4Iun/uc etorres@radon"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOicyMBTcWNqQjm5w1flgZlZqT0uFkTdA2BPk5gbUfa0 etorres@erics-mac"
|
||||
];
|
||||
}
|
||||
|
@@ -18,5 +18,6 @@
|
||||
base.userSSHKeys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDt43wa3heh97BfsDk+3RMteIltWOHcEKJdohasSjRif etorres@xenon"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICEAPw4dzYQD0oMZnSBFmFlHvKvUadO705OwQKtrnQ46 etorres@radon"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICEAPw4dzYQD0oMZnSBFmFlHvKvUadO705OwQKtrnQ46 etorres@radon"
|
||||
];
|
||||
}
|
||||
|
@@ -27,6 +27,6 @@
|
||||
base.userSSHKeys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGZizFOCecyfHqJDDinCl9XTXvCd8RBEM6VN76nGZfSj etorres@xenon"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFV9iQLPBN3aK88aGN3EL4kSP6rMOfiN84KjIdt7jdVn etorres@radon"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICk6WQFO39tY3CZnXr6jF0wwkHH3isWWLFityvObui0L etorres@erics-macbook-pro"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICk6WQFO39tY3CZnXr6jF0wwkHH3isWWLFityvObui0L etorres@erics-mac"
|
||||
];
|
||||
}
|
||||
|
@@ -13,6 +13,7 @@
|
||||
|
||||
base.userSSHKeys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILiUy2yjIkdryH7pYMdkCNryy9gceqXJ7bhtMvvpPBIk etorres@xenon"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILPByHF+TF/4rsMtZ+HxZfwmNi83sia5t+OHjn8X7BHn etorres@radon"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMNNR14i2eqvBLIhWY6yUO+GgFW8L+NGBoDjMUTonE8u etorres@erics-mac"
|
||||
];
|
||||
}
|
||||
|
@@ -17,6 +17,7 @@
|
||||
|
||||
base.userSSHKeys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKG67f82Yhqe2OkeHUN5g8QNLJzGI787OLvvNVwPUfeb etorres@xenon"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB2GkWLmYLYsZO3talZRF+EFUL9JrVOkhnqGLFWGkHxn etorres@radon"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFilrKly3qRkF6mCyFrcfnq2dCYsjNPHsdfUPUQCmkVE etorres@erics-mac"
|
||||
];
|
||||
}
|
||||
|
@@ -93,7 +93,6 @@ in
|
||||
drivers = [ pkgs.gutenprint ];
|
||||
|
||||
extraConf = ''
|
||||
Listen 0.0.0.0:631
|
||||
BrowseLocalProtocols dnssd
|
||||
|
||||
ServerName ${cfg.serverName}
|
||||
|
Reference in New Issue
Block a user