diff --git a/Taskfile b/Taskfile index 8fde074..cef244f 100755 --- a/Taskfile +++ b/Taskfile @@ -15,7 +15,7 @@ dump() { if [ -e "vm-$1.nix" ]; then sudo cp -f result/vzdump* /mnt/share/proxmox/dump/ elif [ -e "lxc-$1.nix" ]; then - sudo cp -f result/tarball/nixos-image-lxc-*.tar.xz "/mnt/share/proxmox/template/cache/$1.tar.xz" + sudo cp -f result/tarball/nixos-system-x86_64-linux.tar.xz "/mnt/share/proxmox/dump/$1.tar.xz" fi } @@ -38,11 +38,6 @@ deploy() { 'nixos-rebuild switch --flake .#'"$1"' --target-host admin@"'"$ip"'" --use-remote-sudo' } -jump-deploy() { - jump_ip=$(tailscale ip xalicas | head -n1) - env NIX_SSHOPTS="-J robert@$jump_ip" ./Taskfile deploy "$1" -} - ssh() { command "${2:-mosh}" admin@"$(get-ip "$1")" } diff --git a/flake.nix b/flake.nix index 6b8206e..3726b2f 100644 --- a/flake.nix +++ b/flake.nix @@ -30,14 +30,12 @@ outputs = { self, nixpkgs, ... }@inputs: majcraft = nixos-vma ./vm-majcraft.nix; homelab = nixos-vma ./vm-homelab.nix; metrics = nixos-lxc ./lxc-metrics.nix; - forge-runner = nixos-lxc ./lxc-forge-runner.nix; }; packages.${system} = { majcraft = image "majcraft"; homelab = image "homelab"; metrics = lxc "metrics"; - forge-runner = lxc "forge-runner"; }; }; } diff --git a/lxc-forge-runner.nix b/lxc-forge-runner.nix deleted file mode 100644 index 245c770..0000000 --- a/lxc-forge-runner.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ - pkgs, - lib, - ... -}: - -{ - imports = [ - ./lxc-base.nix - ]; - - config = { - my.vm = { - name = "runner01"; - ip4 = "192.168.0.7"; - }; - - environment.systemPackages = with pkgs; [ - grafana-to-ntfy - ]; - - networking.extraHosts = '' - 192.168.0.2 xalicas - 192.168.0.3 proxmox - 192.168.0.4 craft01 - 192.168.0.5 lab01 - 192.168.0.6 metrics01 - 192.168.0.7 runner01 - 192.168.0.100 unifi - ''; - - networking.firewall.trustedInterfaces = [ "br-+" ]; - - virtualisation.docker = { - enable = true; - daemon.settings = { - fixed-cidr-v6 = "fd00::/80"; - ipv6 = true; - }; - }; - - services.gitea-actions-runner = { - package = pkgs.forgejo-runner; - instances.runner01 = { - enable = true; - name = "runner01"; - token = "E17wr2p2EH4krR5NIUokwsBhhdLCWNW5ahpEyjHY"; - url = "https://forge.rperce.net/"; - labels = [ - "node-22:docker://node:22-bookworm" - "nixos-latest:docker://nixos/nix" - "playwright-latest:docker://mcr.microsoft.com/playwright:v1.57.0-jammy" - ]; - # settings = { ... }; - }; - }; - }; -} diff --git a/lxc-metrics.nix b/lxc-metrics.nix index 9ec1d7b..207ec9e 100644 --- a/lxc-metrics.nix +++ b/lxc-metrics.nix @@ -17,7 +17,6 @@ environment.systemPackages = with pkgs; [ grafana-to-ntfy - curl ]; networking.extraHosts = '' @@ -26,11 +25,10 @@ 192.168.0.4 craft01 192.168.0.5 lab01 192.168.0.6 metrics01 - 192.168.0.7 runner01 192.168.0.100 unifi ''; - networking.firewall.allowedTCPPorts = [ + networking.firewall.allowedTCPPorts = [ 3000 # grafana 3001 # uptime-kuma ]; @@ -174,7 +172,7 @@ startAt = "daily"; postHook = '' if [ $exitStatus -eq 0 ]; then - /run/current-system/sw/bin/curl -sSL 'http://uptime.rperce.net/api/push/LmyyAawLzw?status=up&msg=OK&ping=' + curl -sSL http://metrics01:3001/api/push/LmyyAawLzw?status=up&msg=OK&ping= fi ''; }; diff --git a/vm-homelab.nix b/vm-homelab.nix index a082ce5..d2d900b 100644 --- a/vm-homelab.nix +++ b/vm-homelab.nix @@ -35,9 +35,6 @@ in "barkeep.rperce.net".extraConfig = '' reverse_proxy http://192.168.0.2:8000 ''; - "crm.rperce.net".extraConfig = '' - reverse_proxy http://192.168.0.2:3000 - ''; "minecraft.dukeceph.xyz".extraConfig = '' reverse_proxy http://192.168.0.4:8080 ''; @@ -108,7 +105,7 @@ in postHook = '' echo "exit $exitStatus" if [ $exitStatus -eq 0 ]; then - /run/current-system/sw/bin/curl -sSL 'http://192.168.0.6:3001/api/push/yTBTVZF8Bz?status=up&msg=OK&ping=' + /run/current-system/sw/bin/curl -sSL http://192.168.0.6:3001/api/push/yTBTVZF8Bz?status=up&msg=OK&ping= fi ''; };