From 652a548ac35367f78836f5ba2cc513d120efd881 Mon Sep 17 00:00:00 2001 From: Nico Jensch Date: Thu, 5 Dec 2024 16:57:27 +0100 Subject: [PATCH] chore: drop dead host It seems to be finally dead, since pings are timing out. --- .../chaotic-v4-builder/docker-compose.yml | 32 ------------------ nixos/flake-module.nix | 5 --- nixos/hosts/garuda-build.nix | 33 ------------------- .../garuda-build/hardware-configuration.nix | 12 ------- secrets | 2 +- 5 files changed, 1 insertion(+), 83 deletions(-) delete mode 100644 docker-compose/chaotic-v4-builder/docker-compose.yml delete mode 100644 nixos/hosts/garuda-build.nix delete mode 100644 nixos/hosts/garuda-build/hardware-configuration.nix diff --git a/docker-compose/chaotic-v4-builder/docker-compose.yml b/docker-compose/chaotic-v4-builder/docker-compose.yml deleted file mode 100644 index 2bdf7814..00000000 --- a/docker-compose/chaotic-v4-builder/docker-compose.yml +++ /dev/null @@ -1,32 +0,0 @@ ---- -services: - chaotic-builder: - image: registry.gitlab.com/garuda-linux/tools/chaotic-manager/manager:latest - container_name: chaotic-builder - command: builder - environment: - BUILDER_CLASS: 3 - BUILDER_HOSTNAME: garuda-build - BUILDER_TIMEOUT: 8600 - REDIS_PASSWORD: ${REDIS_PASSWORD:-?err} - REDIS_SSH_HOST: builds.garudalinux.org - REDIS_SSH_PORT: 400 - REDIS_SSH_USER: package-deployer - SHARED_PATH: /var/garuda/docker-compose-runner/chaotic-v4/shared - volumes: - - ./shared:/shared - - ./sshkey:/app/sshkey - - /var/run/docker.sock:/var/run/docker.sock - deploy: - restart_policy: - condition: always - delay: 60s - - # Automated container updates - watchtower: - image: containrrr/watchtower:latest - container_name: watchtower - command: - --cleanup chaotic-builder watchtower --interval 3600 - volumes: ["/var/run/docker.sock:/var/run/docker.sock"] - restart: always diff --git a/nixos/flake-module.nix b/nixos/flake-module.nix index c8a6dcf1..92489a78 100644 --- a/nixos/flake-module.nix +++ b/nixos/flake-module.nix @@ -68,11 +68,6 @@ in { flake = { nixosConfigurations = { - "garuda-build" = patchedNixosSystem { - inherit system; - inherit specialArgs; - modules = defaultModules ++ [ ./hosts/garuda-build.nix ]; - }; "garuda-mail" = patchedNixosSystem { inherit system; inherit specialArgs; diff --git a/nixos/hosts/garuda-build.nix b/nixos/hosts/garuda-build.nix deleted file mode 100644 index 54e2db40..00000000 --- a/nixos/hosts/garuda-build.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ garuda-lib -, sources -, ... -}: -{ - imports = [ - ../modules - ./garuda-build/hardware-configuration.nix - "${sources.chaotic-portable-builder}/nix/nixos.nix" - ]; - - # Base configuration - networking.interfaces.ens18.ipv4.addresses = [{ - address = "216.158.66.108"; - prefixLength = 24; - }]; - networking.hostName = "garuda-build"; - networking.defaultGateway = "216.158.66.97"; - - # At least try to prevent the insane spam of login attempts - services.openssh.ports = [ 1022 ]; - - # Contains a builder container only - services.docker-compose-runner.chaotic-v4 = { - envfile = garuda-lib.secrets.docker-compose.chaotic-v4-builder; - source = ../../docker-compose/chaotic-v4-builder; - }; - - # Enable the user accounts of chaotic maintainers - garuda-lib.chaoticUsers = true; - - system.stateVersion = "22.05"; -} diff --git a/nixos/hosts/garuda-build/hardware-configuration.nix b/nixos/hosts/garuda-build/hardware-configuration.nix deleted file mode 100644 index 4396d7c1..00000000 --- a/nixos/hosts/garuda-build/hardware-configuration.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ modulesPath, ... }: -{ - imports = [ - (modulesPath + "/profiles/qemu-guest.nix") - ]; - - boot.loader.grub.device = "/dev/sda"; - boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "xen_blkfront" ]; - boot.initrd.kernelModules = [ "nvme" ]; - - fileSystems."/" = { device = "/dev/sda1"; fsType = "ext4"; }; -} diff --git a/secrets b/secrets index 94bcd9d1..312a857f 160000 --- a/secrets +++ b/secrets @@ -1 +1 @@ -Subproject commit 94bcd9d1140586374b1f65e98a61a630e695aeaf +Subproject commit 312a857f05ad02f852f588124f7f51645f985463