From 2cd74954e73faad34771573b53e9ce3ad353f99b Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 16 Jan 2023 22:45:53 +0100
Subject: [PATCH] service/photoprism: apply suggestions

---
 modules/services/photoprism/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/modules/services/photoprism/default.nix b/modules/services/photoprism/default.nix
index 37998b5..a9271a2 100644
--- a/modules/services/photoprism/default.nix
+++ b/modules/services/photoprism/default.nix
@@ -85,7 +85,7 @@ in
       type = lib.types.attrsOf lib.types.str;
       default = { };
       description = lib.mdDoc ''
-        Extra photoprism config options. See [the getting-stated guide](https://docs.photoprism.app/getting-started/config-options/) for available options.
+        Extra photoprism config options. See [the getting-started guide](https://docs.photoprism.app/getting-started/config-options/) for available options.
       '';
       example = {
         PHOTOPRISM_DEFAULT_LOCALE = "de";
@@ -134,7 +134,13 @@ in
       wantedBy = [ "multi-user.target" ];
       environment = env;
 
+      # wait for easier password configuration: https://github.com/photoprism/photoprism/pull/2302
       preStart = ''
+        ${lib.optionalString (cfg.passwordFile != null) ''
+          export PHOTOPRISM_ADMIN_PASSWORD=$(cat "$CREDENTIALS_DIRECTORY/PHOTOPRISM_ADMIN_PASSWORD")
+        ''}
+        exec ${cfg.package}/bin/photoprism migrations run -f
+
         ln -sf ${manage} photoprism-manage
       '';
 
@@ -143,7 +149,6 @@ in
         ${lib.optionalString (cfg.passwordFile != null) ''
           export PHOTOPRISM_ADMIN_PASSWORD=$(cat "$CREDENTIALS_DIRECTORY/PHOTOPRISM_ADMIN_PASSWORD")
         ''}
-        ${cfg.package}/bin/photoprism migrations run -f
         exec ${cfg.package}/bin/photoprism start
       '';
     };