nixos/syncthing: add databaseDir option
#264753 mistakenly used the dataDir option to set the -data argument. This broke existing configurations because -data used to be set to configDir (implicitly, using the -home option, which is equivalent to setting -config and -data to the same value). Fix this by introducing a new databaseDir option sets -data and defaults to configDir. This maintains the existing behavior by default while still allowing users to specify separate config and database directories.
This commit is contained in:
parent
d6a0fea30e
commit
ded5462398
1 changed files with 10 additions and 1 deletions
|
@ -559,6 +559,15 @@ in {
|
|||
'';
|
||||
};
|
||||
|
||||
databaseDir = mkOption {
|
||||
type = types.path;
|
||||
description = lib.mdDoc ''
|
||||
The directory containing the database and logs.
|
||||
'';
|
||||
default = cfg.configDir;
|
||||
defaultText = literalExpression "config.${opt.configDir}";
|
||||
};
|
||||
|
||||
extraFlags = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [];
|
||||
|
@ -660,7 +669,7 @@ in {
|
|||
-no-browser \
|
||||
-gui-address=${if isUnixGui then "unix://" else ""}${cfg.guiAddress} \
|
||||
-config=${cfg.configDir} \
|
||||
-data=${cfg.dataDir} \
|
||||
-data=${cfg.databaseDir} \
|
||||
${escapeShellArgs cfg.extraFlags}
|
||||
'';
|
||||
MemoryDenyWriteExecute = true;
|
||||
|
|
Loading…
Reference in a new issue