diff --git a/hosts/genesis/net/hosts b/hosts/genesis/net/hosts index b0d6b01..3a9fe1b 100644 --- a/hosts/genesis/net/hosts +++ b/hosts/genesis/net/hosts @@ -7,10 +7,10 @@ 10.42.1.1 pve1.thehellings.lan 10.42.1.2 opnsense router opnsense.thehellings.lan router.thehellings.lan 10.42.1.3 printer.thehellings.lan -10.42.1.4 chronicles chronicles.thehellings.lan nas.thehellings.lan +10.42.1.4 chronicles chronicles.thehellings.lan nas.thehellings.lan s3.thehellings.lan 10.42.1.5 genesis genesis.thehellings.lan dns dns.thehellings.lan smart smart.thehellings.lan jellyfin jellyfin.thehellings.lan speedtest.thehellings.lan nixcache.thehellings.lan gitcache.thehellings.lan 10.42.1.6 isaiah isaiah.thehellings.lan minio-01.thehellings.lan -10.42.1.7 hosea hosea.thehellings.lan s3.thehellings.lan +10.42.1.7 hosea hosea.thehellings.lan 10.42.1.8 jeremiah jeremiah.thehellings.lan minio-02.thehellings.lan 10.42.1.12 tv diff --git a/hosts/jeremiah/default.nix b/hosts/jeremiah/default.nix index 2b533dd..e3754a6 100644 --- a/hosts/jeremiah/default.nix +++ b/hosts/jeremiah/default.nix @@ -51,7 +51,7 @@ ]; }; greg = { - home = true; + home = true; tailscale.enable = true; }; environment.systemPackages = with pkgs; [ @@ -59,14 +59,7 @@ curl gawk git - p7zip - packer - pup - gregpy - shellcheck unzip - xorriso - vagrant wget ]; @@ -97,7 +90,7 @@ registrationConfigFile = config.age.secrets.runner-reg.path; environmentVariables = { EFI_DIR = "${pkgs.OVMF.fd}/FV/"; - STORAGE_URL = "http://localhost:9000"; + STORAGE_URL = "http://s3.thehellings.lan:9000"; }; }; }; diff --git a/hosts/myself/container-git.nix b/hosts/myself/container-git.nix index 22f5204..c6c0014 100644 --- a/hosts/myself/container-git.nix +++ b/hosts/myself/container-git.nix @@ -107,7 +107,7 @@ in { proxy_download = false; # Tell them to reach out to object storage themselves! connection = { provider = "AWS"; - endpoint = "http://minio-01.thehellings.lan:9000"; + endpoint = "http://s3.thehellings.lan:9000"; region = "us-east-1"; aws_access_key_id = { _secret = config.age.secrets.minio_access_key_id.path; }; aws_secret_access_key = { _secret = config.age.secrets.minio_secret_access_key.path; }; diff --git a/hosts/myself/container-runner.nix b/hosts/myself/container-runner.nix index 8a90b3f..090690f 100644 --- a/hosts/myself/container-runner.nix +++ b/hosts/myself/container-runner.nix @@ -1,13 +1,7 @@ { inputs, name, extra ? {}, packages ? [], overlays }: ({ config, pkgs, lib, ... }: -let - py = (pkgs.python3.withPackages (p: with p; [ - pip - pyyaml - virtualenv - ])); -in ( +( lib.attrsets.recursiveUpdate { imports = [ @@ -31,15 +25,8 @@ lib.attrsets.recursiveUpdate { curl gawk git - minio-client - p7zip - packer - pup - py - shellcheck unzip xorriso - vagrant wget ] ++ packages; @@ -67,7 +54,7 @@ lib.attrsets.recursiveUpdate { registrationConfigFile = config.age.secrets.runner-reg.path; environmentVariables = { EFI_DIR = "${pkgs.OVMF.fd}/FV/"; - STORAGE_URL = "http://minio-01.thehellings.lan:9000"; + STORAGE_URL = "http://s3.thehellings.lan:9000"; }; }; }; diff --git a/hosts/myself/default.nix b/hosts/myself/default.nix index b012ab1..2c8abb3 100644 --- a/hosts/myself/default.nix +++ b/hosts/myself/default.nix @@ -8,16 +8,6 @@ ./minio.nix ]; - environment.systemPackages = with pkgs; [ - git - packer - (python3.withPackages (p: with p; [ pip virtualenv ])) - tmux - tree - vim - xorriso - ]; - greg.tailscale.enable = true; services = { diff --git a/hosts/myself/git.nix b/hosts/myself/git.nix index 548f261..ee58a74 100644 --- a/hosts/myself/git.nix +++ b/hosts/myself/git.nix @@ -121,7 +121,7 @@ in { registrationConfigFile = config.age.secrets.runner-qemu.path; environmentVariables = { EFI_DIR = "${pkgs.OVMF.fd}/FV/"; - STORAGE_URL = "http://localhost:9000"; + STORAGE_URL = "http://s3.thehellings.lan:9000"; }; }; }; @@ -134,17 +134,7 @@ in { curl gawk git - minio-client - p7zip - packer - pup - (python3.withPackages (p: with p; [ pip pyyaml virtualenv ]) ) - qemu_full - qemu_kvm - shellcheck unzip - xorriso - vagrant wget ]; } diff --git a/secrets/gitlab/jeremiah-runner-reg.age b/secrets/gitlab/jeremiah-runner-reg.age index 0636c77..ae083e9 100644 Binary files a/secrets/gitlab/jeremiah-runner-reg.age and b/secrets/gitlab/jeremiah-runner-reg.age differ diff --git a/secrets/gitlab/myself-podman-runner-reg.age b/secrets/gitlab/myself-podman-runner-reg.age index 2c74220..00a4300 100644 Binary files a/secrets/gitlab/myself-podman-runner-reg.age and b/secrets/gitlab/myself-podman-runner-reg.age differ diff --git a/secrets/gitlab/myself-qemu-runner-reg.age b/secrets/gitlab/myself-qemu-runner-reg.age index b581326..8a77c9f 100644 Binary files a/secrets/gitlab/myself-qemu-runner-reg.age and b/secrets/gitlab/myself-qemu-runner-reg.age differ diff --git a/secrets/gitlab/myself-shell-runner-reg.age b/secrets/gitlab/myself-shell-runner-reg.age index 3dfbdb3..1b457e7 100644 Binary files a/secrets/gitlab/myself-shell-runner-reg.age and b/secrets/gitlab/myself-shell-runner-reg.age differ diff --git a/secrets/gitlab/myself-vbox-runner-reg.age b/secrets/gitlab/myself-vbox-runner-reg.age index 5093d14..9836c03 100644 Binary files a/secrets/gitlab/myself-vbox-runner-reg.age and b/secrets/gitlab/myself-vbox-runner-reg.age differ