Compare commits
No commits in common. "main" and "majcraft-update" have entirely different histories.
main
...
majcraft-u
5 changed files with 4 additions and 74 deletions
7
Taskfile
7
Taskfile
|
|
@ -15,7 +15,7 @@ dump() {
|
||||||
if [ -e "vm-$1.nix" ]; then
|
if [ -e "vm-$1.nix" ]; then
|
||||||
sudo cp -f result/vzdump* /mnt/share/proxmox/dump/
|
sudo cp -f result/vzdump* /mnt/share/proxmox/dump/
|
||||||
elif [ -e "lxc-$1.nix" ]; then
|
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
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -38,11 +38,6 @@ deploy() {
|
||||||
'nixos-rebuild switch --flake .#'"$1"' --target-host admin@"'"$ip"'" --use-remote-sudo'
|
'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() {
|
ssh() {
|
||||||
command "${2:-mosh}" admin@"$(get-ip "$1")"
|
command "${2:-mosh}" admin@"$(get-ip "$1")"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -30,14 +30,12 @@ outputs = { self, nixpkgs, ... }@inputs:
|
||||||
majcraft = nixos-vma ./vm-majcraft.nix;
|
majcraft = nixos-vma ./vm-majcraft.nix;
|
||||||
homelab = nixos-vma ./vm-homelab.nix;
|
homelab = nixos-vma ./vm-homelab.nix;
|
||||||
metrics = nixos-lxc ./lxc-metrics.nix;
|
metrics = nixos-lxc ./lxc-metrics.nix;
|
||||||
forge-runner = nixos-lxc ./lxc-forge-runner.nix;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
packages.${system} = {
|
packages.${system} = {
|
||||||
majcraft = image "majcraft";
|
majcraft = image "majcraft";
|
||||||
homelab = image "homelab";
|
homelab = image "homelab";
|
||||||
metrics = lxc "metrics";
|
metrics = lxc "metrics";
|
||||||
forge-runner = lxc "forge-runner";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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 = { ... };
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -17,7 +17,6 @@
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
grafana-to-ntfy
|
grafana-to-ntfy
|
||||||
curl
|
|
||||||
];
|
];
|
||||||
|
|
||||||
networking.extraHosts = ''
|
networking.extraHosts = ''
|
||||||
|
|
@ -26,7 +25,6 @@
|
||||||
192.168.0.4 craft01
|
192.168.0.4 craft01
|
||||||
192.168.0.5 lab01
|
192.168.0.5 lab01
|
||||||
192.168.0.6 metrics01
|
192.168.0.6 metrics01
|
||||||
192.168.0.7 runner01
|
|
||||||
192.168.0.100 unifi
|
192.168.0.100 unifi
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
@ -174,7 +172,7 @@
|
||||||
startAt = "daily";
|
startAt = "daily";
|
||||||
postHook = ''
|
postHook = ''
|
||||||
if [ $exitStatus -eq 0 ]; then
|
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
|
fi
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -35,9 +35,6 @@ in
|
||||||
"barkeep.rperce.net".extraConfig = ''
|
"barkeep.rperce.net".extraConfig = ''
|
||||||
reverse_proxy http://192.168.0.2:8000
|
reverse_proxy http://192.168.0.2:8000
|
||||||
'';
|
'';
|
||||||
"crm.rperce.net".extraConfig = ''
|
|
||||||
reverse_proxy http://192.168.0.2:3000
|
|
||||||
'';
|
|
||||||
"minecraft.dukeceph.xyz".extraConfig = ''
|
"minecraft.dukeceph.xyz".extraConfig = ''
|
||||||
reverse_proxy http://192.168.0.4:8080
|
reverse_proxy http://192.168.0.4:8080
|
||||||
'';
|
'';
|
||||||
|
|
@ -108,7 +105,7 @@ in
|
||||||
postHook = ''
|
postHook = ''
|
||||||
echo "exit $exitStatus"
|
echo "exit $exitStatus"
|
||||||
if [ $exitStatus -eq 0 ]; then
|
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
|
fi
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue