Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d7e98290c3 | ||
|
|
f5922887bf | ||
|
|
879230dca7 | ||
|
|
1c7e2ff268 | ||
|
|
b324ee5352 |
@@ -12,15 +12,15 @@ def --env unlock [] {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
def rebuild [] {
|
def rebuild [ $target: string = "switch" ] {
|
||||||
if (uname | get operating-system) == "Darwin" {
|
if (uname | get operating-system) == "Darwin" {
|
||||||
sudo darwin-rebuild switch
|
sudo darwin-rebuild $target
|
||||||
} else {
|
} else {
|
||||||
let hostname = uname | get nodename
|
let hostname = uname | get nodename
|
||||||
let build = ^nom build --keep-going $"/etc/nixos#nixosConfigurations.($hostname).config.system.build.toplevel"
|
let build = ^nom build --keep-going $"/etc/nixos#nixosConfigurations.($hostname).config.system.build.toplevel"
|
||||||
if $env.LAST_EXIT_CODE == 0 {
|
if $env.LAST_EXIT_CODE == 0 {
|
||||||
nvd diff /run/current-system result
|
nvd diff /run/current-system result
|
||||||
run0 result/bin/switch-to-configuration switch
|
run0 result/bin/switch-to-configuration $target
|
||||||
} else {
|
} else {
|
||||||
print "Error during build"
|
print "Error during build"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -23,6 +23,7 @@
|
|||||||
mattermost-desktop
|
mattermost-desktop
|
||||||
minio-client
|
minio-client
|
||||||
mumble
|
mumble
|
||||||
|
nix-index
|
||||||
pre-commit
|
pre-commit
|
||||||
prismlauncher
|
prismlauncher
|
||||||
restic
|
restic
|
||||||
|
|||||||
@@ -316,6 +316,26 @@
|
|||||||
name = "Buildbot";
|
name = "Buildbot";
|
||||||
url = "http://jeremiah.shire-zebra.ts.net:8010/";
|
url = "http://jeremiah.shire-zebra.ts.net:8010/";
|
||||||
}
|
}
|
||||||
|
{
|
||||||
|
name = "Garage WebUI";
|
||||||
|
url = "http://nas1.shire-zebra.ts.net:30186/";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Garage RPC";
|
||||||
|
url = "http://nas1.shire-zebra.ts.net:30187/";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Garage S3 API";
|
||||||
|
url = "http://nas1.shire-zebra.ts.net:30188/";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Garage S3 Web";
|
||||||
|
url = "http://nas1.shire-zebra.ts.net:30189/";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Garage Admin";
|
||||||
|
url = "http://nas1.shire-zebra.ts.net:30190/";
|
||||||
|
}
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ let
|
|||||||
url = "https://github.com/fluxcd/flux2/releases/download/v2.7.2/install.yaml";
|
url = "https://github.com/fluxcd/flux2/releases/download/v2.7.2/install.yaml";
|
||||||
sha256 = "sha256-Qs1qJmgZm8q9xZsORjT/N/wzpbWVVODXtzDpjnAYMuQ=";
|
sha256 = "sha256-Qs1qJmgZm8q9xZsORjT/N/wzpbWVVODXtzDpjnAYMuQ=";
|
||||||
};
|
};
|
||||||
|
keepaliveIp = "10.42.5.1";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
options.greg = {
|
options.greg = {
|
||||||
@@ -95,6 +96,7 @@ in
|
|||||||
"--supervisor-metrics=true"
|
"--supervisor-metrics=true"
|
||||||
"--tls-san ${config.networking.hostName}.thehellings.lan"
|
"--tls-san ${config.networking.hostName}.thehellings.lan"
|
||||||
"--tls-san ${config.networking.hostName}.shire-zebra.ts.net"
|
"--tls-san ${config.networking.hostName}.shire-zebra.ts.net"
|
||||||
|
"--tls-san ${keepaliveIp}"
|
||||||
];
|
];
|
||||||
manifests = {
|
manifests = {
|
||||||
cert-manager.source = cert-manager;
|
cert-manager.source = cert-manager;
|
||||||
@@ -116,7 +118,7 @@ in
|
|||||||
state = if (config.networking.hostName == "isaiah") then "MASTER" else "BACKUP";
|
state = if (config.networking.hostName == "isaiah") then "MASTER" else "BACKUP";
|
||||||
virtualIps = [
|
virtualIps = [
|
||||||
{
|
{
|
||||||
addr = "10.42.5.1/16";
|
addr = "${keepaliveIp}/16";
|
||||||
dev = cfg.vipInterface;
|
dev = cfg.vipInterface;
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -122,6 +122,21 @@
|
|||||||
"external": true,
|
"external": true,
|
||||||
"system": "x86_64-linux"
|
"system": "x86_64-linux"
|
||||||
},
|
},
|
||||||
|
"pve2": {
|
||||||
|
"external": true,
|
||||||
|
"ip": "10.42.1.15",
|
||||||
|
"system": "x86_64-linux"
|
||||||
|
},
|
||||||
|
"pve3": {
|
||||||
|
"external": true,
|
||||||
|
"ip": "10.42.1.16",
|
||||||
|
"system": "x86_64-linux"
|
||||||
|
},
|
||||||
|
"pve4": {
|
||||||
|
"external": true,
|
||||||
|
"ip": "10.42.1.17",
|
||||||
|
"system": "x86_64-linux"
|
||||||
|
},
|
||||||
"wsl": {
|
"wsl": {
|
||||||
"external": true,
|
"external": true,
|
||||||
"system": "aarch64-linux"
|
"system": "aarch64-linux"
|
||||||
|
|||||||
Reference in New Issue
Block a user