refactor: drop adminPasswordHashFile, keep only adminPasswordHash
This commit is contained in:
1 parent
5be2005f70
commit
861d0e40ed
1 file changed
+2
-9
@@ -89,16 +89,10 @@
|
|||||||
description = "Embedding model name.";
|
description = "Embedding model name.";
|
||||||
};
|
};
|
||||||
|
|
||||||
adminPasswordHashFile = lib.mkOption {
|
|
||||||
type = lib.types.nullOr lib.types.path;
|
|
||||||
default = null;
|
|
||||||
description = "Path to a file containing the bcrypt hash of the admin password.";
|
|
||||||
};
|
|
||||||
|
|
||||||
adminPasswordHash = lib.mkOption {
|
adminPasswordHash = lib.mkOption {
|
||||||
type = lib.types.nullOr lib.types.str;
|
type = lib.types.nullOr lib.types.str;
|
||||||
default = null;
|
default = null;
|
||||||
description = "Bcrypt hash of the admin password directly. Prefer adminPasswordHashFile for secrets.";
|
description = "Bcrypt hash of the admin bootstrap password.";
|
||||||
};
|
};
|
||||||
|
|
||||||
sqlitePath = lib.mkOption {
|
sqlitePath = lib.mkOption {
|
||||||
@@ -139,9 +133,8 @@
|
|||||||
StateDirectory = "st-pierre";
|
StateDirectory = "st-pierre";
|
||||||
ExecStart = "${st-pierre-pkg}/bin/st-pierre";
|
ExecStart = "${st-pierre-pkg}/bin/st-pierre";
|
||||||
}
|
}
|
||||||
// lib.optionalAttrs (cfg.openaiApiKeyFile != null || cfg.adminPasswordHashFile != null || cfg.qdrantApiKeyFile != null) {
|
// lib.optionalAttrs (cfg.openaiApiKeyFile != null || cfg.qdrantApiKeyFile != null) {
|
||||||
EnvironmentFile = lib.optional (cfg.openaiApiKeyFile != null) cfg.openaiApiKeyFile
|
EnvironmentFile = lib.optional (cfg.openaiApiKeyFile != null) cfg.openaiApiKeyFile
|
||||||
++ lib.optional (cfg.adminPasswordHashFile != null) cfg.adminPasswordHashFile
|
|
||||||
++ lib.optional (cfg.qdrantApiKeyFile != null) cfg.qdrantApiKeyFile;
|
++ lib.optional (cfg.qdrantApiKeyFile != null) cfg.qdrantApiKeyFile;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user