diff --git a/hosts/hl-fws1.nix b/hosts/hl-fws1.nix index c1b9a13..24221b7 100644 --- a/hosts/hl-fws1.nix +++ b/hosts/hl-fws1.nix @@ -7,16 +7,10 @@ in imports = [ ./hl-fws1.hardware-configuration.nix ]; skyg.user.enable = true; skyg.nixos.common.ssh-server.enable = true; - skyg.server.admin.enable = true; skyg.nixos.server.k3s.enable = true; + skyg.server.admin.enable = true; skyg.networkDrives = { enable = true; - options = [ - "x-systemd.automount" - "auto" - "nofail" - "_netdev" - ]; }; # firmware updater services.fwupd.enable = true; diff --git a/hosts/hl-minipc1.nix b/hosts/hl-minipc1.nix index 5535e6b..ab4c62b 100644 --- a/hosts/hl-minipc1.nix +++ b/hosts/hl-minipc1.nix @@ -1,10 +1,15 @@ { user }: { ... }: let + ports = { + audiobookshelf = 8000; + nixServe = 5000; + dockerRegistry = 5001; + }; openPorts = [ - 5000 - 5001 - 8000 + ports.nixServe + ports.dockerRegistry + ports.audiobookshelf 22 ]; in @@ -15,20 +20,16 @@ in skyg.nixos.common.containers.openMetricsPort = true; skyg.server.admin.enable = true; skyg.server.exporters.enable = true; + skyg.nixos.server.k3s.enable = true; skyg.networkDrives = { enable = true; }; skyg.core.tailscaleRouting = "both"; - services.k3s = { - enable = false; - environmentFile = "/mnt/EightTerra/k3s-cluster/configs/k3s.env"; - role = "server"; - }; # # Nix Stores services.nix-serve = { enable = true; secretKeyFile = "/var/keys/cache-priv-key.pem"; - port = 5000; + port = ports.nixServe; }; # firmware updater services.fwupd.enable = true; @@ -38,15 +39,15 @@ in enable = true; host = "0.0.0.0"; openFirewall = true; - port = 8000; + port = ports.dockerRegistry; configDir = "/mnt/Data/audiobookshelf/config"; metadtaDir = "/mnt/Data/audiobookshelf/metadata"; }; }; services.dockerRegistry = { - enable = true; + enable = false; storagePath = "/mnt/Data/docker-registry"; - port = 5001; + port = ports.audiobookshelf; openFirewall = true; listenAddress = "0.0.0.0"; enableDelete = true; diff --git a/modules/network-drives.nix b/modules/network-drives.nix index 9945e43..0117674 100644 --- a/modules/network-drives.nix +++ b/modules/network-drives.nix @@ -20,7 +20,12 @@ in }; options = lib.mkOption { type = lib.types.listOf lib.types.str; - default = [ "defaults" ]; + default = [ + "x-systemd.automount" + "auto" + "nofail" + "_netdev" + ]; }; }; }; diff --git a/modules/nixos/server/k3s/default.nix b/modules/nixos/server/k3s/default.nix index 4581abb..06a57f9 100644 --- a/modules/nixos/server/k3s/default.nix +++ b/modules/nixos/server/k3s/default.nix @@ -19,6 +19,8 @@ in }; config = + let openPorts = [ 6443 80 443 ]; + in lib.mkIf cfg.enable { system.activationScripts.k3sEnv = '' set -e @@ -31,6 +33,14 @@ in enable = true; environmentFile = "/var/lib/k3s/.env"; role = cfg.role; + extraFlags = [ + "--disable servicelb" + "write-kubeconfig-mode 640" + "--write-kubeconfig-group users" + "--disable-helm-controller" + ]; }; + networking.firewall.allowedUDPPorts = openPorts; + networking.firewall.allowedTCPPorts = openPorts; }; }