diff --git a/flake.nix b/flake.nix index 98c9f55..6b25b24 100644 --- a/flake.nix +++ b/flake.nix @@ -78,6 +78,9 @@ imports = [ ./hosts/n100/configuration.nix ./hosts/n100/hardware-configuration.nix + ] ++ [ + # modules + ./modules/gitea/n100 ]; deployment.targetHost = "n100.homelab.local"; @@ -89,6 +92,9 @@ agenix.nixosModules.default ./hosts/zimablade/configuration.nix ./hosts/zimablade/hardware-configuration.nix + ] ++ [ + # modules + ./modules/gitea/zimablade ]; deployment.targetHost = "zimablade.homelab.local"; diff --git a/hosts/n100/ollama.nix b/hosts/n100/ollama.nix index 8a7187a..ef9d47c 100644 --- a/hosts/n100/ollama.nix +++ b/hosts/n100/ollama.nix @@ -1,6 +1,19 @@ {inputs, ...}: { - virtualisation.docker = { + # virtualisation.docker = { + # enable = true; + # storageDriver = "btrfs"; + # }; + + services.ollama = { enable = true; - storageDriver = "btrfs"; + openFirewall = true; + loadModels = [ ]; + }; + + services.open-webui = { + enable = true; + openFirewall = true; + host = "0.0.0.0"; + port = 8050; }; } diff --git a/hosts/zimablade/configuration.nix b/hosts/zimablade/configuration.nix index f23f708..271ce30 100644 --- a/hosts/zimablade/configuration.nix +++ b/hosts/zimablade/configuration.nix @@ -15,7 +15,6 @@ ./glances.nix ./secrets.nix ./coredns - ./gitea.nix ./copyparty.nix ]; diff --git a/hosts/zimablade/gitea.nix b/hosts/zimablade/gitea.nix deleted file mode 100644 index 72833f6..0000000 --- a/hosts/zimablade/gitea.nix +++ /dev/null @@ -1,18 +0,0 @@ -{lib, nodes, ...}: let - ssh_port = 24658; -in { - services = { - gitea = { - enable = true; - settings = { - server = { - DOMAIN = "git.shobu.fr"; - SSH_PORT = ssh_port; - }; - }; - }; - # openssh = { - # ports = lib.mkAfter [ ssh_port ]; - # }; - }; -} diff --git a/modules/gitea/n100/default.nix b/modules/gitea/n100/default.nix index e69de29..4d0e9d3 100644 --- a/modules/gitea/n100/default.nix +++ b/modules/gitea/n100/default.nix @@ -0,0 +1,7 @@ +{nodes, ...}:{ + networking.nat.forwardPorts = [{ + sourcePort = nodes.zimablade.config.services.gitea.settings.server.SSH_PORT; + proto = "tcp"; + destination = "10.0.0.4:22"; + }]; +}