diff --git a/SUMMARY.md b/SUMMARY.md index d562822..c69dcf2 100644 --- a/SUMMARY.md +++ b/SUMMARY.md @@ -28,4 +28,3 @@ ______________________________________________________________________ - [calanda](nixos-configurations/calanda/README.md) - [cyprianspitz](nixos-configurations/cyprianspitz/README.md) - [lindberg](nixos-configurations/lindberg/README.md) -- [stompert](nixos-configurations/stompert/README.md) diff --git a/defaults/meta/hosts.json b/defaults/meta/hosts.json index 8ae54a3..39d478d 100644 --- a/defaults/meta/hosts.json +++ b/defaults/meta/hosts.json @@ -22,10 +22,6 @@ "batzberg": { "hostName": "batzberg" }, - "stompert": { - "hostName": "stompert", - "sshKey": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEKuqMPLbREFIrYcmReaRoHdz1TatpvlrZN14L6cikia" - }, "router-coredump": { "hostName": "router" }, diff --git a/defaults/meta/network-physical.nix b/defaults/meta/network-physical.nix index a83fe09..e83d37f 100644 --- a/defaults/meta/network-physical.nix +++ b/defaults/meta/network-physical.nix @@ -52,13 +52,6 @@ }; }; - eem-lan = { - domain = "eem-lan.net.qo.is"; - hosts = { - stompert.v4.ip = ""; # TODO - }; - }; - riedbach-ext = { # IP: Dynamic domain = "riedbach-ext.net.qo.is"; diff --git a/defaults/meta/network-virtual.nix b/defaults/meta/network-virtual.nix index 1c323c1..efbe225 100644 --- a/defaults/meta/network-virtual.nix +++ b/defaults/meta/network-virtual.nix @@ -39,11 +39,6 @@ publicKey = "6XGL4QKB8AMpm/VGcTgWqk9RiSws7DmY5TpIDkXbwlg="; persistentKeepalive = 25; }; - stompert = { - v4.ip = "10.250.0.5"; - publicKey = "CHTjQbmN9WhbRCxKgowxpMx4c5Zu0NDk0rRXEvuB3XA="; - persistentKeepalive = 25; - }; calanda = { v4.ip = "10.250.0.6"; publicKey = "WMuMCzo8e/aNeGP7256mhK0Fe+x06Ws7a9hOZDPCr0M="; diff --git a/defaults/meta/network.md b/defaults/meta/network.md index f119bf9..07eaae8 100644 --- a/defaults/meta/network.md +++ b/defaults/meta/network.md @@ -37,14 +37,6 @@ package "riedbach.net.qo.is" { riedbachrouter -- "enp5s0" lindberg } -package "eem.net.qo.is" { - node eemrouter - - node stompert - - eemrouter -- "enp2s0" stompert -} - cloud internet[ @ ] @@ -59,7 +51,6 @@ package "coredump.net.qo.is" { internet .. mediaconvchur: INIT7 Fiber (1G/1G) internet .. riedbachrouter: iway Fiber (1G/1G) -internet .. eemrouter: KPN NL Fiber internet .. coredumprouter: Openfactory DSL @enduml ``` diff --git a/flake.lock b/flake.lock index a28ea17..ef5fbce 100644 --- a/flake.lock +++ b/flake.lock @@ -170,10 +170,11 @@ ] }, "locked": { - "lastModified": 1743779182, - "narHash": "sha256-0wQ+22g6dfnIBIvw2Mji37R7OmCMrmqcp/4zSLQRKSQ=", - "rev": "8e7ec0d7f4a571a55d0e6b99fcd6f85fea474f1e", - "revCount": 16, + "lastModified": 1747599024, + "narHash": "sha256-qc94Cyt6uaQCVY2VlCtNxGb7hs3DbLvxuhEnSLFL8T8=", + "ref": "refs/heads/main", + "rev": "bed7588246ec58aacac3d0ff5b191fa6cc9faa98", + "revCount": 17, "type": "git", "url": "file:./private" }, diff --git a/nixos-configurations/stompert/README.md b/nixos-configurations/stompert/README.md deleted file mode 100644 index 84ceeb2..0000000 --- a/nixos-configurations/stompert/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# Operations {#\_operations} - -Reboot requires passphrase (see pass `host/stompert/hdd_luks`) - -```bash -ssh -p 2222 root@stompert.eem-ext.net.qo.is -``` diff --git a/nixos-configurations/stompert/default.nix b/nixos-configurations/stompert/default.nix deleted file mode 100644 index 688aa31..0000000 --- a/nixos-configurations/stompert/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). - -{ ... }: - -{ - imports = [ - ../../defaults/hardware/apu.nix - ]; - - qois.system.physical.enable = true; - - boot.initrd.luks.devices."systems".device = - "/dev/disk/by-uuid/5718bd19-cb7a-4728-9ec4-6b2be48215fc"; - - fileSystems."/" = { - device = "/dev/mapper/vg_systems-hv_stompert"; - fsType = "btrfs"; - options = [ "subvol=root" ]; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/bbe12368-1f81-4924-a12c-2edec886f7c8"; - fsType = "ext4"; - }; - - swapDevices = [ { device = "/dev/disk/by-uuid/851e1d05-569f-41ca-8ed9-d7ffba489ffe"; } ]; - - # Use the GRUB 2 boot loader. - boot.loader.grub.enable = true; - # boot.loader.grub.efiSupport = true; - # boot.loader.grub.efiInstallAsRemovable = true; - # boot.loader.efi.efiSysMountPoint = "/boot/efi"; - # Define on which hard drive you want to install Grub. - boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only - - qois.luks-ssh = { - enable = true; - interface = "eth1"; - sshPort = 2222; - }; - - networking.hostName = "stompert"; # Define your hostname. - - # The global useDHCP flag is deprecated, therefore explicitly set to false here. - # Per-interface useDHCP will be mandatory in the future, so this generated config - # replicates the default behaviour. - networking.useDHCP = false; - networking.interfaces.enp1s0.useDHCP = true; - networking.interfaces.enp2s0.useDHCP = true; - networking.interfaces.enp3s0.useDHCP = true; - networking.tempAddresses = "disabled"; - - qois.backplane-net.enable = true; - - # Set your time zone. - # time.timeZone = "Europe/Amsterdam"; - - # This value determines the NixOS release with which your system is to be - # compatible, in order to avoid breaking some software such as database - # servers. You should change this only after NixOS release notes say you - # should. - system.stateVersion = "24.11"; # Did you read the comment? -} diff --git a/private b/private index 8e7ec0d..bed7588 160000 --- a/private +++ b/private @@ -1 +1 @@ -Subproject commit 8e7ec0d7f4a571a55d0e6b99fcd6f85fea474f1e +Subproject commit bed7588246ec58aacac3d0ff5b191fa6cc9faa98