hosts: server: fix initial mistakes and add pub

This commit is contained in:
Kabbone 2024-04-02 11:49:46 +02:00
parent 9de2d29400
commit 62ac639d08
Signed by: Kabbone
SSH Key Fingerprint: SHA256:A5zPB5I6u5V78V51c362BBdCwhDhfDUVbt7NfKdjWBY
3 changed files with 12 additions and 3 deletions

View File

@ -144,7 +144,7 @@ in
modules = [ modules = [
agenix.nixosModules.default agenix.nixosModules.default
microvm.nixosModules.host microvm.nixosModules.host
./server ./server_big
./configuration_server.nix ./configuration_server.nix
nixos-hardware.nixosModules.common-cpu-amd nixos-hardware.nixosModules.common-cpu-amd
nixos-hardware.nixosModules.common-pc-ssd nixos-hardware.nixosModules.common-pc-ssd

View File

@ -78,6 +78,12 @@
options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@srv,discard=async" ]; options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@srv,discard=async" ];
}; };
fileSystems."/var" =
{ device = "/dev/disk/by-label/NIXROOT";
fsType = "btrfs";
options = [ "space_cache=v2,ssd,noatime,subvol=@var,discard=async" ];
};
fileSystems."/nix" = fileSystems."/nix" =
{ device = "/dev/disk/by-label/NIXROOT"; { device = "/dev/disk/by-label/NIXROOT";
fsType = "btrfs"; fsType = "btrfs";
@ -115,12 +121,12 @@
prefixLength = 24; prefixLength = 24;
} ]; } ];
ipv6.addresses = [ { ipv6.addresses = [ {
address = "2a13:7e80:0:ef::"; address = "2a13:7e80:0:ef::2";
prefixLength = 64; prefixLength = 64;
} ]; } ];
}; };
}; };
defaultGateway = "37.44.215.182"; defaultGateway = "37.44.215.1";
defaultGateway6 = { defaultGateway6 = {
address = "fe80::1"; address = "fe80::1";
interface = "ens18"; interface = "ens18";

View File

@ -19,6 +19,7 @@ let
]; ];
server = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDwN8p78OncPIRUfV64PLHOem4LtlQ3opOJwLEYqdGVx"; server = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDwN8p78OncPIRUfV64PLHOem4LtlQ3opOJwLEYqdGVx";
server2 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPm3epi3v+yuskxQZgmPdkVDET8IGeYA6LbTCqPWqkz+";
dmz = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAmivVLbkJJ1anwQ8CeNT7rv0Qxinp1LIQIjVWZpnIE5"; dmz = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAmivVLbkJJ1anwQ8CeNT7rv0Qxinp1LIQIjVWZpnIE5";
hades = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEgnWyQUUa+vcHAKx6edbTgqW8ph+MCiS6fUwYjYcS+o"; hades = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEgnWyQUUa+vcHAKx6edbTgqW8ph+MCiS6fUwYjYcS+o";
nasbak = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOdoxslkKn3ouadPOHmDN7e5AtoJmnllnUmhl1j9qfzz"; nasbak = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOdoxslkKn3ouadPOHmDN7e5AtoJmnllnUmhl1j9qfzz";
@ -29,6 +30,7 @@ let
serverrunner="ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJacRr6zXpyWsN9lcu+zZ+Mu09FselLq1b6jDvOLiKPs"; serverrunner="ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJacRr6zXpyWsN9lcu+zZ+Mu09FselLq1b6jDvOLiKPs";
systems = [ systems = [
server server
server2
dmz dmz
hades hades
nasbak nasbak
@ -40,6 +42,7 @@ let
]; ];
servers = [ servers = [
server server
server2
]; ];
homerunners = [ homerunners = [
homerunner homerunner