Try to migrate minio to NAS

Try to move as much of the S3 load onto the NAS as I am able to manage,
incluing pointing s3.thehellings.lan towards the NAS
This commit is contained in:
Greg Hellings
2024-08-16 22:46:05 -05:00
parent 400ba3eef7
commit 4d4beaf620
11 changed files with 8 additions and 48 deletions
+2 -2
View File
@@ -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
+2 -9
View File
@@ -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";
};
};
};
+1 -1
View File
@@ -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; };
+2 -15
View File
@@ -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";
};
};
};
-10
View File
@@ -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 = {
+1 -11
View File
@@ -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
];
}