Update from updated-inputs-2024-06-07-01-03

flake.lock

@@ -268,11 +268,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1717196966,
+        "lastModified": 1717602782,
-        "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=",
+        "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8",
+        "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6",
         "type": "github"
       },
       "original": {

flake.nix

@@ -72,7 +72,6 @@
         ];
       };
       mail-2 = {};
-      minecraft-2 = {};
       monitoring-3 = {};
       nonat = {};
       osmium = {};

hosts/clerie-backup/configuration.nix

@@ -56,10 +56,6 @@
       authorizedKeys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKC1pw7u/LcriXMt9mRhjjw7IvKh3Hfj2R6sZbybk5x6 web-2"];
       path = "/mnt/clerie-backup/web-2";
     };
-    minecraft-2 = {
-      authorizedKeys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC3GLVwBZnwZhjZOZSzDnaPsQ00ak47lJ2dpmtIkBqgHDhwlo1jL83izdGysSqL0Pm1xDTy5dX52WWp4B2xr/M5QAj2pCymbRCb+doLQxc59TXsL0a6KhmMC3pdpERRukyh2QR4urVzSGu33ZnL7pIjc4kkiBeblSGm01HdHImbjbFEGO0smHJ12Zem7zhgzmHBE1fPgVTpLx1QeQlMvSQSASLrinj3zIPpDwtUaMqx1d0C3xgijSysNaZzBLVBAhMrMoCOueMhA0o/t3irnAjBzxPSomZqNAYBrZdIYL4zAj/lyJEz3+Bki0VaxR5woSVyQ9N3FKhyCqNrouCdaKbet76yIPvIixug4+E9oYXs+Iaj8ywcYh605sKMKGoeNJH7OFIl8H0SjSXRtef3q3lD0VSJUzK7fAqL8t3tBSiYuU4n5CCYeCEOedqPu8ATqR0t5riVPZLQO6L2r/2Q5Mjy8/ZZkBMFB0/iK2dXMbX+AYWZ4JnPiGRomjkPKiJXnmE= root@minecraft-2"];
-      path = "/mnt/clerie-backup/minecraft-2";
-    };
   };
 
   # fix borgbackup primary grouping

hosts/gatekeeper/configuration.nix

@@ -128,21 +128,6 @@
       host = "nonat.net.clerie.de";
       port = 22;
     };
-    # riese
-    tcpPorts."25566" = {
-      host = "minecraft-2.net.clerie.de";
-      port = 25566;
-    };
-    # chaos
-    tcpPorts."25568" = {
-      host = "minecraft-2.net.clerie.de";
-      port = 25568;
-    };
-    # aerilon
-    tcpPorts."25569" = {
-      host = "minecraft-2.net.clerie.de";
-      port = 25565;
-    };
   };
 
   clerie.monitoring = {

hosts/minecraft-2/configuration.nix

@@ -1,74 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-let
-  eulaFile = builtins.toFile "eula.txt" ''
-    # eula.txt managed by NixOS Configuration
-    eula=true
-  '';
-in {
-  imports =
-    [
-      ./hardware-configuration.nix
-      ../../configuration/proxmox-vm
-    ];
-
-  boot.loader.grub.enable = true;
-  boot.loader.grub.device = "/dev/sda";
-
-  networking.useDHCP = false;
-  networking.interfaces.ens19.ipv4.addresses = [ { address = "192.168.10.31"; prefixLength = 24; } ];
-  networking.interfaces.ens18.ipv6.addresses = [ { address = "2001:638:904:ffcb::9"; prefixLength = 64; } ];
-  networking.defaultGateway = { address = "192.168.10.1"; interface = "ens19"; };
-  networking.defaultGateway6 = { address = "2001:638:904:ffcb::1"; interface = "ens18"; };
-  networking.nameservers = [ "2001:638:904:ffcc::3" "2001:638:904:ffcc::4" "141.24.40.3" "141.24.40.4" ];
-
-  clerie.minecraft-server.servers.aerilon.enable = true; # port 25565
-  clerie.minecraft-server.servers.riese.enable = true; # port 25566
-  clerie.minecraft-server.servers.chaos.enable = true; # port 25568
-
-  networking.firewall.allowedTCPPorts = [ 25565 25566 25568 ];
-
-  services.borgbackup.jobs = {
-    main = {
-      paths = [
-        "/var/src"
-        "/var/lib"
-      ];
-      doInit = true;
-      repo =  "borg@backup.clerie.de:." ;
-      encryption = {
-        mode = "repokey-blake2";
-        passCommand = "cat /var/src/secrets/borg/main";
-      };
-      environment = { BORG_RSH = "ssh -i /var/src/secrets/ssh/borg-main"; };
-      compression = "auto,lzma";
-      startAt = "hourly";
-    };
-  };
-
-  clerie.backup = {
-    enable = true;
-    jobs = {
-      main = {
-        paths = [
-          "/var/lib"
-        ];
-      };
-    };
-  };
-
-  clerie.system-auto-upgrade = {
-    allowReboot = true;
-    autoUpgrade = true;
-  };
-
-  clerie.monitoring = {
-    enable = true;
-    id = "202";
-    pubkey = "n03aQ8dJZvxbYJUiNnbCkirOIc8R82RVrqkqNtgfAnc=";
-  };
-
-  system.stateVersion = "21.03";
-}

hosts/minecraft-2/hardware-configuration.nix

@@ -1,23 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports =
-    [ (modulesPath + "/profiles/qemu-guest.nix")
-    ];
-
-  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/472ace36-d152-4139-9ea8-76f104e619d3";
-      fsType = "ext4";
-    };
-
-  swapDevices = [ ];
-
-}

hosts/minecraft-2/secrets.json

@@ -1,29 +0,0 @@
-{
-	"clerie-backup-job-main": "ENC[AES256_GCM,data:WX5QobcSfvQg9d4fbbU79fqIMcFTE+9oSFAnTcbAA7ljZ7OxY42xQzTwEBJaowBT/MZNINDRBYudRtAqIPrsMA==,iv:he613LVfSaBRSTGBBYYefXvLOglstN6Dhvy42VTMa7o=,tag:aWulppIPHE9OwoFH2oAJFw==,type:str]",
-	"clerie-backup-target-cyan": "ENC[AES256_GCM,data:ZfPM0GanKDkKpGcmNb3Hejy0bD3/iLU3ugSiBaifdeALrCF+inANZ203XRdGjYT1Ifzj2EKnIyhurQiMvUAsJQ==,iv:brsD9uybx7kPlv+Oegldfg/a30kgsOBTeE4HxQ7TPAU=,tag:9LAjruOYMqvwe0S2fkxm+w==,type:str]",
-	"clerie-backup-target-magenta": "ENC[AES256_GCM,data:+pwsjMF2s3fgXM7m1df8/MztQH0ZNG0xGr5JEkiwdR1/0l7id+Ie2RamvhmM96SPsO6MSP95vXE0NaTsjbbVqg==,iv:aO6mcnktSgWP9a+o2rDtrmBMhBhj0l3GjSjXDwTf8ns=,tag:fgOaITQSfb7OujlOofeppA==,type:str]",
-	"wg-monitoring": "ENC[AES256_GCM,data:+DKbzWaZpkkrdUVxA0a+ZGfqIsAnbw9fSWlfo0CH5jItDQV9A/NqRFJVtis=,iv:Hncmy+Yu+FqgV374ETC7H0wHSf0sAJDuuRT9f5nu8QA=,tag:Rxi1GyIXLSvcrC5uFoOfHg==,type:str]",
-	"sops": {
-		"kms": null,
-		"gcp_kms": null,
-		"azure_kv": null,
-		"hc_vault": null,
-		"age": [
-			{
-				"recipient": "age15aqsntxzd48t036tekumpxj6cgw6t5weplrvk88mfcq4glgc8y5q3kn3hf",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAwVkVwRlBIU0pieFp4MDRP\nR2V5Z1ZVNExmYjlhMnljMFYxZ2dkTldQc2owCmxxdWN2UnExZ0FpTmJqMFJ6NlR3\nN2JhV1FXQmFJaGEvUXRnV3VIYnRKTkUKLS0tIFRPaXBjMUpyUWZNTTYzSWNSY01h\nOHUxUDRJMGUvb1FTMHgrWHVYQ1VxVXMKG4IguWm5+5MdoVJtAEr64osunrxk7DGH\nxaGoKINpjaYX8j2045g2BG5nMuhxR1APWFyOtegs2pJY7GsuZNkZww==\n-----END AGE ENCRYPTED FILE-----\n"
-			}
-		],
-		"lastmodified": "2024-05-05T11:27:24Z",
-		"mac": "ENC[AES256_GCM,data:Nwn/7pYXFOmjt2lH/ONFhX8yebh8aRdeyleXFYqUD9T9IkITftka2A4IseUp1u9c4GYAcUeVv/2O3Zwg7QiLw+AGmwypU0OV/tlA2NmlVpOP/yjoHgVpbecQdll972CSjiHouNNhtbMHK/iBEx1WCGjsCc9Nq3pzsnSxTRDihUk=,iv:OWRFa6WHa6ukGeQfLGQMS1BY8FFK/BbQ/SLEwRMgKH4=,tag:BbstVHpXo8PwmqVTE+PKCQ==,type:str]",
-		"pgp": [
-			{
-				"created_at": "2024-05-05T11:26:14Z",
-				"enc": "-----BEGIN PGP MESSAGE-----\n\n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\nmIjPQR+QYQ==\n=jRJ5\n-----END PGP MESSAGE-----",
-				"fp": "0C982F87B7AFBA0F504F90A2629E741947C87928"
-			}
-		],
-		"unencrypted_suffix": "_unencrypted",
-		"version": "3.8.1"
-	}
-}

hosts/minecraft-2/ssh.pub

@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIYGtzxrVeuA7ShtNLmf2iBQDT/4h6aQHQHsuJ2WbSN/