Compare commits
No commits in common. "35fd6d6d63cd2dd504acd0aa5af33bca4b73f57b" and "d4cc7f893e646b397b590be772499f2a6253911b" have entirely different histories.
35fd6d6d63
...
d4cc7f893e
15 changed files with 18 additions and 131 deletions
8
flake.lock
generated
8
flake.lock
generated
|
|
@ -476,11 +476,11 @@
|
|||
"secrets": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1781207988,
|
||||
"narHash": "sha256-ZsPqHeeUXDR1fksT4EGlizv8RHPHp42kusVNhnenzxo=",
|
||||
"lastModified": 1779441912,
|
||||
"narHash": "sha256-Le50mFgpetFC8gyc1j3+oXEjRV3lZdeU2vqBtoWaAJo=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "53c5bdca5f2ff22b4e950c38b4d8bb96ee03c80d",
|
||||
"revCount": 40,
|
||||
"rev": "847ed2f52fd5ff0ead5958d6932b219b4254a2bf",
|
||||
"revCount": 38,
|
||||
"type": "git",
|
||||
"url": "ssh://git@git.jfreudenberger.de/JuliusFreudenberger/nix-private.git"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -136,7 +136,6 @@
|
|||
modules = [
|
||||
./hosts/busch
|
||||
disko.nixosModules.disko
|
||||
agenix.nixosModules.default
|
||||
proxmox-nixos.nixosModules.proxmox-ve
|
||||
|
||||
({...}: {
|
||||
|
|
|
|||
|
|
@ -56,15 +56,6 @@
|
|||
tokenSecretFile = config.age.secrets.hawser-token;
|
||||
};
|
||||
|
||||
services.beszel.agent = {
|
||||
enable = true;
|
||||
environment = {
|
||||
HUB_URL = "https://beszel.jfreudenberger.de";
|
||||
DISABLE_SSH = "true";
|
||||
};
|
||||
environmentFile = config.age.secrets.beszel.path;
|
||||
};
|
||||
|
||||
# This option defines the first version of NixOS you have installed on this particular machine,
|
||||
# and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
|
||||
# Most users should NEVER change this value after the initial install, for any reason,
|
||||
|
|
|
|||
|
|
@ -2,6 +2,5 @@
|
|||
{
|
||||
age.secrets = {
|
||||
hawser-token.file = "${inputs.secrets}/secrets/busch-gpu-docker/hawser-token";
|
||||
beszel.file = "${inputs.secrets}/secrets/busch-gpu-docker/beszel";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,15 +44,6 @@
|
|||
tokenSecretFile = config.age.secrets.hawser-token;
|
||||
};
|
||||
|
||||
services.beszel.agent = {
|
||||
enable = true;
|
||||
environment = {
|
||||
HUB_URL = "https://beszel.jfreudenberger.de";
|
||||
DISABLE_SSH = "true";
|
||||
};
|
||||
environmentFile = config.age.secrets.beszel.path;
|
||||
};
|
||||
|
||||
# This option defines the first version of NixOS you have installed on this particular machine,
|
||||
# and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
|
||||
# Most users should NEVER change this value after the initial install, for any reason,
|
||||
|
|
|
|||
|
|
@ -2,6 +2,5 @@
|
|||
{
|
||||
age.secrets = {
|
||||
hawser-token.file = "${inputs.secrets}/secrets/busch-main-docker/hawser-token";
|
||||
beszel.file = "${inputs.secrets}/secrets/busch-main-docker/beszel";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
imports =
|
||||
[
|
||||
./disko.nix
|
||||
./secrets.nix
|
||||
|
||||
../../modules/nix.nix
|
||||
../../modules/auto-upgrade.nix
|
||||
|
|
@ -30,31 +29,21 @@
|
|||
|
||||
networking.hostName = "busch"; # Define your hostname.
|
||||
|
||||
services = {
|
||||
netbird = {
|
||||
package = pkgs-unstable.netbird;
|
||||
useRoutingFeatures = "both";
|
||||
clients.wt0 = {
|
||||
hardened = false;
|
||||
login = {
|
||||
enable = true;
|
||||
setupKeyFile = (pkgs.writeText "setupKey" ''
|
||||
A99F5508-D543-40B7-A31A-A8931B1AE246
|
||||
'').outPath;
|
||||
};
|
||||
port = 51820;
|
||||
environment = {
|
||||
NB_MANAGEMENT_URL = "https://netbird.jfreudenberger.de";
|
||||
};
|
||||
services.netbird = {
|
||||
package = pkgs-unstable.netbird;
|
||||
useRoutingFeatures = "both";
|
||||
clients.wt0 = {
|
||||
hardened = false;
|
||||
login = {
|
||||
enable = true;
|
||||
setupKeyFile = (pkgs.writeText "setupKey" ''
|
||||
A99F5508-D543-40B7-A31A-A8931B1AE246
|
||||
'').outPath;
|
||||
};
|
||||
};
|
||||
beszel.agent = {
|
||||
enable = true;
|
||||
port = 51820;
|
||||
environment = {
|
||||
HUB_URL = "https://beszel.jfreudenberger.de";
|
||||
DISABLE_SSH = "true";
|
||||
NB_MANAGEMENT_URL = "https://netbird.jfreudenberger.de";
|
||||
};
|
||||
environmentFile = config.age.secrets.beszel.path;
|
||||
};
|
||||
};
|
||||
systemd.services.${config.services.netbird.clients.wt0.service.name}.path = [ pkgs.shadow ];
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
{ inputs, ... }:
|
||||
{
|
||||
age.secrets = {
|
||||
beszel.file = "${inputs.secrets}/secrets/busch/beszel";
|
||||
};
|
||||
}
|
||||
|
|
@ -16,7 +16,6 @@
|
|||
../../modules/docker.nix
|
||||
../../modules/traefik.nix
|
||||
../../modules/pocket-id.nix
|
||||
../../modules/beszel-hub.nix
|
||||
../../modules/netbird-docker.nix
|
||||
../../modules/netbird-client.nix
|
||||
../../modules/dockhand.nix
|
||||
|
|
@ -52,11 +51,6 @@
|
|||
appUrl = "dockhand.jfreudenberger.de";
|
||||
};
|
||||
|
||||
beszel-docker = {
|
||||
enable = true;
|
||||
appUrl = "https://beszel.jfreudenberger.de";
|
||||
};
|
||||
|
||||
netbird-docker = {
|
||||
enable = true;
|
||||
secrets = config.age.secrets.netbird-server;
|
||||
|
|
|
|||
|
|
@ -33,15 +33,6 @@
|
|||
tokenSecretFile = config.age.secrets.hawser-token;
|
||||
};
|
||||
|
||||
services.beszel.agent = {
|
||||
enable = true;
|
||||
environment = {
|
||||
HUB_URL = "https://beszel.jfreudenberger.de";
|
||||
DISABLE_SSH = "true";
|
||||
};
|
||||
environmentFile = config.age.secrets.beszel.path;
|
||||
};
|
||||
|
||||
networking.firewall = {
|
||||
checkReversePath = "loose";
|
||||
allowedTCPPorts = [
|
||||
|
|
|
|||
|
|
@ -2,6 +2,5 @@
|
|||
{
|
||||
age.secrets = {
|
||||
hawser-token.file = "${inputs.secrets}/secrets/xcy/hawser-token";
|
||||
beszel.file = "${inputs.secrets}/secrets/xcy/beszel";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,58 +0,0 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
let
|
||||
|
||||
cfg = config.services.beszel-docker;
|
||||
version = "0.18.7";
|
||||
|
||||
in {
|
||||
|
||||
options.services.beszel-docker = {
|
||||
enable = lib.mkEnableOption "Beszel hub hosted as OCI container";
|
||||
appUrl = lib.mkOption {
|
||||
description = "URL of the beszel hub";
|
||||
type = lib.types.str;
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
virtualisation.oci-containers.containers = {
|
||||
beszel = {
|
||||
image = "henrygd/beszel:${version}";
|
||||
autoStart = true;
|
||||
networks = [
|
||||
"traefik"
|
||||
];
|
||||
environment = {
|
||||
APP_URL = cfg.appUrl;
|
||||
};
|
||||
extraOptions = [
|
||||
''--mount=type=volume,source=data,target=/beszel_data,volume-driver=local''
|
||||
/*''--health-cmd=["/beszel" "health" "--url" "http://localhost:8090"]''
|
||||
"--health-interval=120s"
|
||||
"--health-timeout=5s"
|
||||
"--health-retries=2"
|
||||
"--health-start-period=10s"*/
|
||||
];
|
||||
labels = {
|
||||
"traefik.enable" = "true";
|
||||
"traefik.http.routers.beszel.rule" = "Host(`${lib.removePrefix "https://" cfg.appUrl}`)";
|
||||
"traefik.http.routers.beszel.entrypoints" = "websecure";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
systemd.services."docker-beszel" = {
|
||||
after = [
|
||||
"docker-traefik.service"
|
||||
];
|
||||
requires = [
|
||||
"docker-traefik.service"
|
||||
];
|
||||
};
|
||||
|
||||
};
|
||||
}
|
||||
|
|
@ -41,7 +41,6 @@
|
|||
pinentry-gnome3
|
||||
xdotool
|
||||
playerctl
|
||||
networkmanager_dmenu
|
||||
];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ let
|
|||
|
||||
cfg = config.services.pocket-id-docker;
|
||||
pocketidCfg = config.services.pocket-id;
|
||||
version = "2.8.0";
|
||||
version = "2.6.2";
|
||||
|
||||
in {
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
let
|
||||
|
||||
cfg = config.services.traefik-docker;
|
||||
version = "3.7.5";
|
||||
version = "3.6.14";
|
||||
|
||||
in {
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue