Merge pull request #131794 from ncfavier/syncthing-collapse-declarative

nixos/syncthing: move declarative options to the top level

Lassulus 729042fa dbe50548

Changed files
+291 -278
nixos
modules
services
networking
tests
+284 -269
nixos/modules/services/networking/syncthing.nix
···
let
cfg = config.services.syncthing;
defaultUser = "syncthing";
devices = mapAttrsToList (name: device: {
deviceID = device.id;
inherit (device) name addresses introducer;
-
}) cfg.declarative.devices;
folders = mapAttrsToList ( _: folder: {
inherit (folder) path id label type;
-
devices = map (device: { deviceId = cfg.declarative.devices.${device}.id; }) folder.devices;
rescanIntervalS = folder.rescanInterval;
fsWatcherEnabled = folder.watch;
fsWatcherDelayS = folder.watchDelay;
···
}) (filterAttrs (
_: folder:
folder.enable
-
) cfg.declarative.folders);
updateConfig = pkgs.writers.writeDash "merge-syncthing-config" ''
set -efu
···
# generate the new config by merging with the NixOS config options
new_cfg=$(echo "$old_cfg" | ${pkgs.jq}/bin/jq -c '. * {
-
"devices": (${builtins.toJSON devices}${optionalString (! cfg.declarative.overrideDevices) " + .devices"}),
-
"folders": (${builtins.toJSON folders}${optionalString (! cfg.declarative.overrideFolders) " + .folders"})
-
} * ${builtins.toJSON cfg.declarative.extraOptions}')
# send the new config
curl -X PUT -d "$new_cfg" ${cfg.guiAddress}/rest/config
···
options = {
services.syncthing = {
-
enable = mkEnableOption ''
-
Syncthing - the self-hosted open-source alternative
-
to Dropbox and Bittorrent Sync. Initial interface will be
-
available on http://127.0.0.1:8384/.
-
'';
-
declarative = {
-
cert = mkOption {
-
type = types.nullOr types.str;
-
default = null;
-
description = ''
-
Path to users cert.pem file, will be copied into Syncthing's
-
<literal>configDir</literal>
-
'';
-
};
-
key = mkOption {
-
type = types.nullOr types.str;
-
default = null;
-
description = ''
-
Path to users key.pem file, will be copied into Syncthing's
-
<literal>configDir</literal>
-
'';
-
};
-
overrideDevices = mkOption {
-
type = types.bool;
-
default = true;
-
description = ''
-
Whether to delete the devices which are not configured via the
-
<literal>declarative.devices</literal> option.
-
If set to false, devices added via the webinterface will
-
persist but will have to be deleted manually.
-
'';
};
-
devices = mkOption {
-
default = {};
-
description = ''
-
Peers/devices which Syncthing should communicate with.
-
'';
-
example = {
-
bigbox = {
-
id = "7CFNTQM-IMTJBHJ-3UWRDIU-ZGQJFR6-VCXZ3NB-XUH3KZO-N52ITXR-LAIYUAU";
-
addresses = [ "tcp://192.168.0.10:51820" ];
};
-
};
-
type = types.attrsOf (types.submodule ({ name, ... }: {
-
options = {
-
name = mkOption {
-
type = types.str;
-
default = name;
-
description = ''
-
Name of the device
-
'';
-
};
-
addresses = mkOption {
-
type = types.listOf types.str;
-
default = [];
-
description = ''
-
The addresses used to connect to the device.
-
If this is let empty, dynamic configuration is attempted
-
'';
-
};
-
id = mkOption {
-
type = types.str;
-
description = ''
-
The id of the other peer, this is mandatory. It's documented at
-
https://docs.syncthing.net/dev/device-ids.html
-
'';
-
};
-
introducer = mkOption {
-
type = types.bool;
-
default = false;
-
description = ''
-
If the device should act as an introducer and be allowed
-
to add folders on this computer.
-
'';
-
};
-
};
-
}));
-
};
-
overrideFolders = mkOption {
-
type = types.bool;
-
default = true;
-
description = ''
-
Whether to delete the folders which are not configured via the
-
<literal>declarative.folders</literal> option.
-
If set to false, folders added via the webinterface will persist
-
but will have to be deleted manually.
-
'';
-
};
-
folders = mkOption {
-
default = {};
-
description = ''
-
Folders which should be shared by Syncthing.
-
'';
-
example = literalExample ''
-
{
-
"/home/user/sync" = {
-
id = "syncme";
-
devices = [ "bigbox" ];
-
};
-
}
-
'';
-
type = types.attrsOf (types.submodule ({ name, ... }: {
-
options = {
-
enable = mkOption {
-
type = types.bool;
-
default = true;
-
description = ''
-
share this folder.
-
This option is useful when you want to define all folders
-
in one place, but not every machine should share all folders.
-
'';
-
};
-
path = mkOption {
-
type = types.str;
-
default = name;
-
description = ''
-
The path to the folder which should be shared.
-
'';
-
};
-
id = mkOption {
-
type = types.str;
-
default = name;
-
description = ''
-
The id of the folder. Must be the same on all devices.
-
'';
-
};
-
label = mkOption {
-
type = types.str;
-
default = name;
-
description = ''
-
The label of the folder.
-
'';
-
};
-
devices = mkOption {
-
type = types.listOf types.str;
-
default = [];
-
description = ''
-
The devices this folder should be shared with. Must be defined
-
in the <literal>declarative.devices</literal> attribute.
-
'';
-
};
-
versioning = mkOption {
-
default = null;
-
description = ''
-
How to keep changed/deleted files with Syncthing.
-
There are 4 different types of versioning with different parameters.
-
See https://docs.syncthing.net/users/versioning.html
-
'';
-
example = [
{
versioning = {
type = "simple";
···
{
versioning = {
type = "external";
-
params.versionsPath = pkgs.writers.writeBash "backup" ''
folderpath="$1"
filepath="$2"
rm -rf "$folderpath/$filepath"
-
'';
};
}
-
];
-
type = with types; nullOr (submodule {
-
options = {
-
type = mkOption {
-
type = enum [ "external" "simple" "staggered" "trashcan" ];
-
description = ''
-
Type of versioning.
-
See https://docs.syncthing.net/users/versioning.html
-
'';
-
};
-
params = mkOption {
-
type = attrsOf (either str path);
-
description = ''
-
Parameters for versioning. Structure depends on versioning.type.
-
See https://docs.syncthing.net/users/versioning.html
-
'';
-
};
};
-
});
-
};
-
-
rescanInterval = mkOption {
-
type = types.int;
-
default = 3600;
-
description = ''
-
How often the folders should be rescaned for changes.
-
'';
-
};
-
type = mkOption {
-
type = types.enum [ "sendreceive" "sendonly" "receiveonly" ];
-
default = "sendreceive";
-
description = ''
-
Whether to send only changes from this folder, only receive them
-
or propagate both.
-
'';
-
};
-
watch = mkOption {
-
type = types.bool;
-
default = true;
-
description = ''
-
Whether the folder should be watched for changes by inotify.
-
'';
-
};
-
watchDelay = mkOption {
-
type = types.int;
-
default = 10;
-
description = ''
-
The delay after an inotify event is triggered.
-
'';
-
};
-
ignorePerms = mkOption {
-
type = types.bool;
-
default = true;
-
description = ''
-
Whether to propagate permission changes.
-
'';
-
};
-
ignoreDelete = mkOption {
-
type = types.bool;
-
default = false;
-
description = ''
-
Whether to delete files in destination. See <link
-
xlink:href="https://docs.syncthing.net/advanced/folder-ignoredelete.html">
-
upstream's docs</link>.
-
'';
-
};
};
-
}));
-
};
-
extraOptions = mkOption {
-
type = types.addCheck (pkgs.formats.json {}).type isAttrs;
-
default = {};
-
description = ''
-
Extra configuration options for Syncthing.
-
'';
-
example = {
-
options.localAnnounceEnabled = false;
-
gui.theme = "black";
};
};
};
···
type = types.str;
default = "127.0.0.1:8384";
description = ''
-
Address to serve the GUI.
'';
};
systemService = mkOption {
type = types.bool;
default = true;
-
description = "Auto launch Syncthing as a system service.";
};
user = mkOption {
type = types.str;
default = defaultUser;
description = ''
-
Syncthing will be run under this user (user will be created if it doesn't exist.
-
This can be your user name).
'';
};
group = mkOption {
type = types.str;
-
default = defaultUser;
description = ''
-
Syncthing will be run under this group (group will not be created if it doesn't exist.
-
This can be your user name).
'';
};
···
default = null;
example = "socks5://address.com:1234";
description = ''
-
Overwrites all_proxy environment variable for the Syncthing process to
-
the given value. This is normaly used to let relay client connect
-
through SOCKS5 proxy server.
'';
};
dataDir = mkOption {
type = types.path;
default = "/var/lib/syncthing";
description = ''
-
Path where synced directories will exist.
'';
};
-
configDir = mkOption {
type = types.path;
description = ''
-
Path where the settings and keys will exist.
'';
-
default =
-
let
-
nixos = config.system.stateVersion;
-
cond = versionAtLeast nixos "19.03";
-
in cfg.dataDir + (optionalString cond "/.config/syncthing");
};
openDefaultPorts = mkOption {
type = types.bool;
default = false;
-
example = literalExample "true";
description = ''
-
Open the default ports in the firewall:
-
- TCP 22000 for transfers
-
- UDP 21027 for discovery
-
If multiple users are running Syncthing on this machine, you will need to manually open a set of ports for each instance and leave this disabled.
-
Alternatively, if are running only a single instance on this machine using the default ports, enable this.
'';
};
package = mkOption {
type = types.package;
default = pkgs.syncthing;
-
defaultText = "pkgs.syncthing";
-
example = literalExample "pkgs.syncthing";
description = ''
-
Syncthing package to use.
'';
};
};
};
imports = [
-
(mkRemovedOptionModule ["services" "syncthing" "useInotify"] ''
This option was removed because Syncthing now has the inotify functionality included under the name "fswatcher".
-
It can be enabled on a per-folder basis through the webinterface.
'')
-
];
###### implementation
···
};
};
-
users.groups = mkIf (cfg.systemService && cfg.group == defaultUser) {
-
${defaultUser}.gid =
config.ids.gids.syncthing;
};
···
RestartForceExitStatus="3 4";
User = cfg.user;
Group = cfg.group;
-
ExecStartPre = mkIf (cfg.declarative.cert != null || cfg.declarative.key != null)
"+${pkgs.writers.writeBash "syncthing-copy-keys" ''
install -dm700 -o ${cfg.user} -g ${cfg.group} ${cfg.configDir}
-
${optionalString (cfg.declarative.cert != null) ''
-
install -Dm400 -o ${cfg.user} -g ${cfg.group} ${toString cfg.declarative.cert} ${cfg.configDir}/cert.pem
''}
-
${optionalString (cfg.declarative.key != null) ''
-
install -Dm400 -o ${cfg.user} -g ${cfg.group} ${toString cfg.declarative.key} ${cfg.configDir}/key.pem
''}
''}"
;
···
};
};
syncthing-init = mkIf (
-
cfg.declarative.devices != {} || cfg.declarative.folders != {} || cfg.declarative.extraOptions != {}
) {
description = "Syncthing configuration updater";
after = [ "syncthing.service" ];
···
let
cfg = config.services.syncthing;
defaultUser = "syncthing";
+
defaultGroup = defaultUser;
devices = mapAttrsToList (name: device: {
deviceID = device.id;
inherit (device) name addresses introducer;
+
}) cfg.devices;
folders = mapAttrsToList ( _: folder: {
inherit (folder) path id label type;
+
devices = map (device: { deviceId = cfg.devices.${device}.id; }) folder.devices;
rescanIntervalS = folder.rescanInterval;
fsWatcherEnabled = folder.watch;
fsWatcherDelayS = folder.watchDelay;
···
}) (filterAttrs (
_: folder:
folder.enable
+
) cfg.folders);
updateConfig = pkgs.writers.writeDash "merge-syncthing-config" ''
set -efu
···
# generate the new config by merging with the NixOS config options
new_cfg=$(echo "$old_cfg" | ${pkgs.jq}/bin/jq -c '. * {
+
"devices": (${builtins.toJSON devices}${optionalString (! cfg.overrideDevices) " + .devices"}),
+
"folders": (${builtins.toJSON folders}${optionalString (! cfg.overrideFolders) " + .folders"})
+
} * ${builtins.toJSON cfg.extraOptions}')
# send the new config
curl -X PUT -d "$new_cfg" ${cfg.guiAddress}/rest/config
···
options = {
services.syncthing = {
+
enable = mkEnableOption
+
"Syncthing, a self-hosted open-source alternative to Dropbox and Bittorrent Sync";
+
cert = mkOption {
+
type = types.nullOr types.str;
+
default = null;
+
description = ''
+
Path to the <literal>cert.pem</literal> file, which will be copied into Syncthing's
+
<link linkend="opt-services.syncthing.configDir">configDir</link>.
+
'';
+
};
+
key = mkOption {
+
type = types.nullOr types.str;
+
default = null;
+
description = ''
+
Path to the <literal>key.pem</literal> file, which will be copied into Syncthing's
+
<link linkend="opt-services.syncthing.configDir">configDir</link>.
+
'';
+
};
+
+
overrideDevices = mkOption {
+
type = types.bool;
+
default = true;
+
description = ''
+
Whether to delete the devices which are not configured via the
+
<link linkend="opt-services.syncthing.devices">devices</link> option.
+
If set to <literal>false</literal>, devices added via the web
+
interface will persist and will have to be deleted manually.
+
'';
+
};
+
+
devices = mkOption {
+
default = {};
+
description = ''
+
Peers/devices which Syncthing should communicate with.
+
Note that you can still add devices manually, but those changes
+
will be reverted on restart if <link linkend="opt-services.syncthing.overrideDevices">overrideDevices</link>
+
is enabled.
+
'';
+
example = {
+
bigbox = {
+
id = "7CFNTQM-IMTJBHJ-3UWRDIU-ZGQJFR6-VCXZ3NB-XUH3KZO-N52ITXR-LAIYUAU";
+
addresses = [ "tcp://192.168.0.10:51820" ];
+
};
};
+
type = types.attrsOf (types.submodule ({ name, ... }: {
+
options = {
+
name = mkOption {
+
type = types.str;
+
default = name;
+
description = ''
+
The name of the device.
+
'';
};
+
addresses = mkOption {
+
type = types.listOf types.str;
+
default = [];
+
description = ''
+
The addresses used to connect to the device.
+
If this is left empty, dynamic configuration is attempted.
+
'';
+
};
+
id = mkOption {
+
type = types.str;
+
description = ''
+
The device ID. See <link xlink:href="https://docs.syncthing.net/dev/device-ids.html"/>.
+
'';
+
};
+
introducer = mkOption {
+
type = types.bool;
+
default = false;
+
description = ''
+
Whether the device should act as an introducer and be allowed
+
to add folders on this computer.
+
See <link xlink:href="https://docs.syncthing.net/users/introducer.html"/>.
+
'';
+
};
+
};
+
}));
+
};
+
overrideFolders = mkOption {
+
type = types.bool;
+
default = true;
+
description = ''
+
Whether to delete the folders which are not configured via the
+
<link linkend="opt-services.syncthing.folders">folders</link> option.
+
If set to <literal>false</literal>, folders added via the web
+
interface will persist and will have to be deleted manually.
+
'';
+
};
+
folders = mkOption {
+
default = {};
+
description = ''
+
Folders which should be shared by Syncthing.
+
Note that you can still add devices manually, but those changes
+
will be reverted on restart if <link linkend="opt-services.syncthing.overrideDevices">overrideDevices</link>
+
is enabled.
+
'';
+
example = literalExample ''
+
{
+
"/home/user/sync" = {
+
id = "syncme";
+
devices = [ "bigbox" ];
+
};
+
}
+
'';
+
type = types.attrsOf (types.submodule ({ name, ... }: {
+
options = {
+
enable = mkOption {
+
type = types.bool;
+
default = true;
+
description = ''
+
Whether to share this folder.
+
This option is useful when you want to define all folders
+
in one place, but not every machine should share all folders.
+
'';
+
};
+
path = mkOption {
+
type = types.str;
+
default = name;
+
description = ''
+
The path to the folder which should be shared.
+
'';
+
};
+
id = mkOption {
+
type = types.str;
+
default = name;
+
description = ''
+
The ID of the folder. Must be the same on all devices.
+
'';
+
};
+
label = mkOption {
+
type = types.str;
+
default = name;
+
description = ''
+
The label of the folder.
+
'';
+
};
+
devices = mkOption {
+
type = types.listOf types.str;
+
default = [];
+
description = ''
+
The devices this folder should be shared with. Each device must
+
be defined in the <link linkend="opt-services.syncthing.devices">devices</link> option.
+
'';
+
};
+
versioning = mkOption {
+
default = null;
+
description = ''
+
How to keep changed/deleted files with Syncthing.
+
There are 4 different types of versioning with different parameters.
+
See <link xlink:href="https://docs.syncthing.net/users/versioning.html"/>.
+
'';
+
example = literalExample ''
+
[
{
versioning = {
type = "simple";
···
{
versioning = {
type = "external";
+
params.versionsPath = pkgs.writers.writeBash "backup" '''
folderpath="$1"
filepath="$2"
rm -rf "$folderpath/$filepath"
+
''';
};
}
+
]
+
'';
+
type = with types; nullOr (submodule {
+
options = {
+
type = mkOption {
+
type = enum [ "external" "simple" "staggered" "trashcan" ];
+
description = ''
+
The type of versioning.
+
See <link xlink:href="https://docs.syncthing.net/users/versioning.html"/>.
+
'';
};
+
params = mkOption {
+
type = attrsOf (either str path);
+
description = ''
+
The parameters for versioning. Structure depends on
+
<link linkend="opt-services.syncthing.folders._name_.versioning.type">versioning.type</link>.
+
See <link xlink:href="https://docs.syncthing.net/users/versioning.html"/>.
+
'';
+
};
+
};
+
});
+
};
+
rescanInterval = mkOption {
+
type = types.int;
+
default = 3600;
+
description = ''
+
How often the folder should be rescanned for changes.
+
'';
+
};
+
type = mkOption {
+
type = types.enum [ "sendreceive" "sendonly" "receiveonly" ];
+
default = "sendreceive";
+
description = ''
+
Whether to only send changes for this folder, only receive them
+
or both.
+
'';
+
};
+
watch = mkOption {
+
type = types.bool;
+
default = true;
+
description = ''
+
Whether the folder should be watched for changes by inotify.
+
'';
+
};
+
watchDelay = mkOption {
+
type = types.int;
+
default = 10;
+
description = ''
+
The delay after an inotify event is triggered.
+
'';
+
};
+
ignorePerms = mkOption {
+
type = types.bool;
+
default = true;
+
description = ''
+
Whether to ignore permission changes.
+
'';
};
+
ignoreDelete = mkOption {
+
type = types.bool;
+
default = false;
+
description = ''
+
Whether to skip deleting files that are deleted by peers.
+
See <link xlink:href="https://docs.syncthing.net/advanced/folder-ignoredelete.html"/>.
+
'';
+
};
};
+
}));
+
};
+
+
extraOptions = mkOption {
+
type = types.addCheck (pkgs.formats.json {}).type isAttrs;
+
default = {};
+
description = ''
+
Extra configuration options for Syncthing.
+
See <link xlink:href="https://docs.syncthing.net/users/config.html"/>.
+
'';
+
example = {
+
options.localAnnounceEnabled = false;
+
gui.theme = "black";
};
};
···
type = types.str;
default = "127.0.0.1:8384";
description = ''
+
The address to serve the web interface at.
'';
};
systemService = mkOption {
type = types.bool;
default = true;
+
description = ''
+
Whether to auto-launch Syncthing as a system service.
+
'';
};
user = mkOption {
type = types.str;
default = defaultUser;
+
example = "yourUser";
description = ''
+
The user to run Syncthing as.
+
By default, a user named <literal>${defaultUser}</literal> will be created.
'';
};
group = mkOption {
type = types.str;
+
default = defaultGroup;
+
example = "yourGroup";
description = ''
+
The group to run Syncthing under.
+
By default, a group named <literal>${defaultGroup}</literal> will be created.
'';
};
···
default = null;
example = "socks5://address.com:1234";
description = ''
+
Overwrites the all_proxy environment variable for the Syncthing process to
+
the given value. This is normally used to let Syncthing connect
+
through a SOCKS5 proxy server.
+
See <link xlink:href="https://docs.syncthing.net/users/proxying.html"/>.
'';
};
dataDir = mkOption {
type = types.path;
default = "/var/lib/syncthing";
+
example = "/home/yourUser";
description = ''
+
The path where synchronised directories will exist.
'';
};
+
configDir = let
+
cond = versionAtLeast config.system.stateVersion "19.03";
+
in mkOption {
type = types.path;
description = ''
+
The path where the settings and keys will exist.
'';
+
default = cfg.dataDir + (optionalString cond "/.config/syncthing");
+
defaultText = literalExample "dataDir${optionalString cond " + \"/.config/syncthing\""}";
};
openDefaultPorts = mkOption {
type = types.bool;
default = false;
+
example = true;
description = ''
+
Whether to open the default ports in the firewall: TCP 22000 for transfers
+
and UDP 21027 for discovery.
+
+
If multiple users are running Syncthing on this machine, you will need
+
to manually open a set of ports for each instance and leave this disabled.
+
Alternatively, if you are running only a single instance on this machine
+
using the default ports, enable this.
'';
};
package = mkOption {
type = types.package;
default = pkgs.syncthing;
+
defaultText = literalExample "pkgs.syncthing";
description = ''
+
The Syncthing package to use.
'';
};
};
};
imports = [
+
(mkRemovedOptionModule [ "services" "syncthing" "useInotify" ] ''
This option was removed because Syncthing now has the inotify functionality included under the name "fswatcher".
+
It can be enabled on a per-folder basis through the web interface.
'')
+
] ++ map (o:
+
mkRenamedOptionModule [ "services" "syncthing" "declarative" o ] [ "services" "syncthing" o ]
+
) [ "cert" "key" "devices" "folders" "overrideDevices" "overrideFolders" "extraOptions"];
###### implementation
···
};
};
+
users.groups = mkIf (cfg.systemService && cfg.group == defaultGroup) {
+
${defaultGroup}.gid =
config.ids.gids.syncthing;
};
···
RestartForceExitStatus="3 4";
User = cfg.user;
Group = cfg.group;
+
ExecStartPre = mkIf (cfg.cert != null || cfg.key != null)
"+${pkgs.writers.writeBash "syncthing-copy-keys" ''
install -dm700 -o ${cfg.user} -g ${cfg.group} ${cfg.configDir}
+
${optionalString (cfg.cert != null) ''
+
install -Dm400 -o ${cfg.user} -g ${cfg.group} ${toString cfg.cert} ${cfg.configDir}/cert.pem
''}
+
${optionalString (cfg.key != null) ''
+
install -Dm400 -o ${cfg.user} -g ${cfg.group} ${toString cfg.key} ${cfg.configDir}/key.pem
''}
''}"
;
···
};
};
syncthing-init = mkIf (
+
cfg.devices != {} || cfg.folders != {} || cfg.extraOptions != {}
) {
description = "Syncthing configuration updater";
after = [ "syncthing.service" ];
+7 -9
nixos/tests/syncthing-init.nix
···
machine = {
services.syncthing = {
enable = true;
-
declarative = {
-
devices.testDevice = {
-
id = testId;
-
};
-
folders.testFolder = {
-
path = "/tmp/test";
-
devices = [ "testDevice" ];
-
};
-
extraOptions.gui.user = "guiUser";
};
};
};
···
machine = {
services.syncthing = {
enable = true;
+
devices.testDevice = {
+
id = testId;
};
+
folders.testFolder = {
+
path = "/tmp/test";
+
devices = [ "testDevice" ];
+
};
+
extraOptions.gui.user = "guiUser";
};
};