From dc2842a807cf40ba7f62af298b01022198eb73d2 Mon Sep 17 00:00:00 2001 From: Constantin Gierczak--Galle Date: Thu, 21 Nov 2024 19:38:29 +0100 Subject: [PATCH 1/3] fix(photo01): reenable nginx --- machines/photo01/_configuration.nix | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/machines/photo01/_configuration.nix b/machines/photo01/_configuration.nix index 5faeb18..f6c08a7 100644 --- a/machines/photo01/_configuration.nix +++ b/machines/photo01/_configuration.nix @@ -9,8 +9,9 @@ in ./_hardware-configuration.nix # NOTE: For now, only deploy the bare minimum - ./photoprism.nix ./immich.nix + ./nginx.nix + ./photoprism.nix ]; deployment.targetHost = address; @@ -53,29 +54,4 @@ in }; }; }; - - # TODO: switch to unixsockets if supported - - nix = { - settings = { - trusted-users = [ - "@wheel" - "root" - "nix-ssh" - ]; - auto-optimise-store = true; - }; - #package = pkgs.nixUnstable; - extraOptions = - let - empty_registry = builtins.toFile "empty-flake-registry.json" ''{"flakes":[],"version":2}''; - in - '' - experimental-features = nix-command flakes - flake-registry = ${empty_registry} - builders-use-substitutes = true - ''; - registry.nixpkgs.flake = inputs.nixpkgs; - nixPath = [ "nixpkgs=${inputs.nixpkgs}" ]; - }; } From b391255aa96edd8eb3fd1a25a1ac35e8caafdd10 Mon Sep 17 00:00:00 2001 From: Constantin Gierczak--Galle Date: Thu, 21 Nov 2024 19:43:51 +0100 Subject: [PATCH 2/3] fix(photo01): fix immich port --- machines/photo01/_configuration.nix | 1 - machines/photo01/immich.nix | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/machines/photo01/_configuration.nix b/machines/photo01/_configuration.nix index f6c08a7..c9acf28 100644 --- a/machines/photo01/_configuration.nix +++ b/machines/photo01/_configuration.nix @@ -34,7 +34,6 @@ in ]; security.acme.acceptTerms = true; - security.acme.defaults.email = "webmaster@nixos.org"; systemd.network = { config.routeTables = { diff --git a/machines/photo01/immich.nix b/machines/photo01/immich.nix index d19721c..3d1f0c9 100644 --- a/machines/photo01/immich.nix +++ b/machines/photo01/immich.nix @@ -1,7 +1,8 @@ { services.immich = { enable = true; - # default port: 3001 + # NOTE: default port changes in a later version + port = 3001; machine-learning.enable = true; host = "localhost"; }; @@ -10,6 +11,6 @@ enableACME = true; forceSSL = true; serverAliases = [ ]; - locations."/".proxyPass = "http://localhost:2283/"; + locations."/".proxyPass = "http://localhost:3001/"; }; } From e54ef96b2a2fb68ec87c809d4316dcb196d4f3d8 Mon Sep 17 00:00:00 2001 From: Constantin Gierczak--Galle Date: Thu, 21 Nov 2024 19:44:43 +0100 Subject: [PATCH 3/3] fix(photo01): fmt --- machines/photo01/_configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/machines/photo01/_configuration.nix b/machines/photo01/_configuration.nix index c9acf28..4da2284 100644 --- a/machines/photo01/_configuration.nix +++ b/machines/photo01/_configuration.nix @@ -1,5 +1,5 @@ # TODO: revamp to use the same framework as the other VMs -{ pkgs, inputs, ... }: +{ pkgs, ... }: let address = "129.199.146.101";