From 382628f233b979328a493a4767877c281fc7b101 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Mon, 11 Nov 2024 09:52:34 -0500 Subject: [PATCH] dockge + upgrade --- .gitignore | 3 ++- hosts/fwbook.nix | 5 +++-- hosts/hl-minipc2.nix | 7 ++++--- modules/nixos/server/services/dockge.nix | 7 +++++-- result.diff | 0 5 files changed, 14 insertions(+), 8 deletions(-) delete mode 100644 result.diff diff --git a/.gitignore b/.gitignore index 763f675..07c9ab3 100644 --- a/.gitignore +++ b/.gitignore @@ -19,4 +19,5 @@ result.diff result results diffs -.locks \ No newline at end of file +.locks +result.diff diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index c0f2945..316963a 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -11,7 +11,7 @@ in imports = [ ./fwbook.hardware-configuration.nix ]; # Skyg environment.sessionVariables.COSMIC_DATA_CONTROL_ENABLED = 1; - skyg = { + skyg = { user.enable = true; server.admin.enable = true; core.qemu.enable = true; @@ -34,7 +34,7 @@ in server.arrs = { enable = false; rootDataDir = "/mnt/terra1/Data/apps/arrs"; - prowlarr.enable = true; + prowlarr.enable = false; }; }; services.displayManager.defaultSession = "plasmax11"; @@ -76,6 +76,7 @@ in # skype skypeforlinux # Work + postgresql dvc-with-remotes google-cloud-sdk awscli diff --git a/hosts/hl-minipc2.nix b/hosts/hl-minipc2.nix index 7a804cc..f79bee9 100644 --- a/hosts/hl-minipc2.nix +++ b/hosts/hl-minipc2.nix @@ -1,5 +1,6 @@ { user }: -{ ... }: { +{ ... }: +{ imports = [ ./hl-minipc2.hardware-configuration.nix ]; skyg.user.enable = true; skyg.nixos.common.ssh-server.enable = true; @@ -19,8 +20,8 @@ dockge = { enable = true; openFirewall = true; - stacksDir = " /mnt/terra1/Data/apps/arrs/dockge/stacks"; - dataaDir = " /mnt/terra1/Data/apps/arrs/dockge/data"; + stacksDir = "/mnt/terra1/Data/apps/arrs/dockge/stacks"; + dataDir = "/mnt/terra1/Data/apps/arrs/dockge/data"; }; }; } diff --git a/modules/nixos/server/services/dockge.nix b/modules/nixos/server/services/dockge.nix index f6f5079..529d5f5 100644 --- a/modules/nixos/server/services/dockge.nix +++ b/modules/nixos/server/services/dockge.nix @@ -36,14 +36,17 @@ in config = lib.mkIf cfg.enable { networking.firewall = - lib.mkIf cfg.openFirewall { allowedTCPPorts = [ cfg.port ]; }; + lib.mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.port ]; + allowedUDPPorts = [ cfg.port ]; + }; virtualisation.oci-containers = { containers = { dockge = { autoStart = true; image = "louislam/dockge:1"; ports = [ - "${cfg.port}:5001" + "${toString cfg.port}:5001" ]; volumes = [ "/var/run/docker.sock:/var/run/docker.sock" diff --git a/result.diff b/result.diff deleted file mode 100644 index e69de29..0000000