Merge pull request #131794 from ncfavier/syncthing-collapse-declarative (729042fa) · Commits · nix / nixpkgs

nixos/modules/services/networking/syncthing.nix

+298 −283

Original line number	Diff line number	Diff line
		@@ -5,15 +5,16 @@ with lib;
		let
		cfg = config.services.syncthing;
		defaultUser = "syncthing";
		defaultGroup = defaultUser;

		devices = mapAttrsToList (name: device: {
		deviceID = device.id;
		inherit (device) name addresses introducer;
		}) cfg.declarative.devices;
		}) cfg.devices;

		folders = mapAttrsToList ( _: folder: {
		inherit (folder) path id label type;
		devices = map (device: { deviceId = cfg.declarative.devices.${device}.id; }) folder.devices;
		devices = map (device: { deviceId = cfg.devices.${device}.id; }) folder.devices;
		rescanIntervalS = folder.rescanInterval;
		fsWatcherEnabled = folder.watch;
		fsWatcherDelayS = folder.watchDelay;
		@@ -23,7 +24,7 @@ let
		}) (filterAttrs (
		_: folder:
		folder.enable
		) cfg.declarative.folders);
		) cfg.folders);

		updateConfig = pkgs.writers.writeDash "merge-syncthing-config" ''
		set -efu
		@@ -50,9 +51,9 @@ let

		# 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}')
		"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
		@@ -68,19 +69,15 @@ in {
		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/.
		'';
		enable = mkEnableOption
		"Syncthing, a self-hosted open-source alternative to Dropbox and Bittorrent Sync";

		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>
		Path to the <literal>cert.pem</literal> file, which will be copied into Syncthing's
		<link linkend="opt-services.syncthing.configDir">configDir</link>.
		'';
		};

		@@ -88,8 +85,8 @@ in {
		type = types.nullOr types.str;
		default = null;
		description = ''
		Path to users key.pem file, will be copied into Syncthing's
		<literal>configDir</literal>
		Path to the <literal>key.pem</literal> file, which will be copied into Syncthing's
		<link linkend="opt-services.syncthing.configDir">configDir</link>.
		'';
		};

		@@ -98,9 +95,9 @@ in {
		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.
		<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.
		'';
		};

		@@ -108,6 +105,10 @@ in {
		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 = {
		@@ -122,7 +123,7 @@ in {
		type = types.str;
		default = name;
		description = ''
		Name of the device
		The name of the device.
		'';
		};

		@@ -131,15 +132,14 @@ in {
		default = [];
		description = ''
		The addresses used to connect to the device.
		If this is let empty, dynamic configuration is attempted
		If this is left 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
		The device ID. See <link xlink:href="https://docs.syncthing.net/dev/device-ids.html"/>.
		'';
		};

		@@ -147,8 +147,9 @@ in {
		type = types.bool;
		default = false;
		description = ''
		If the device should act as an introducer and be allowed
		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"/>.
		'';
		};

		@@ -161,9 +162,9 @@ in {
		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.
		<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.
		'';
		};

		@@ -171,6 +172,10 @@ in {
		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 ''
		{
		@@ -187,7 +192,7 @@ in {
		type = types.bool;
		default = true;
		description = ''
		share this folder.
		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.
		'';
		@@ -205,7 +210,7 @@ in {
		type = types.str;
		default = name;
		description = ''
		The id of the folder. Must be the same on all devices.
		The ID of the folder. Must be the same on all devices.
		'';
		};

		@@ -221,8 +226,8 @@ in {
		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.
		The devices this folder should be shared with. Each device must
		be defined in the <link linkend="opt-services.syncthing.devices">devices</link> option.
		'';
		};

		@@ -231,9 +236,10 @@ in {
		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
		See <link xlink:href="https://docs.syncthing.net/users/versioning.html"/>.
		'';
		example = [
		example = literalExample ''
		[
		{
		versioning = {
		type = "simple";
		@@ -259,28 +265,30 @@ in {
		{
		versioning = {
		type = "external";
		params.versionsPath = pkgs.writers.writeBash "backup" ''
		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
		The type of versioning.
		See <link xlink:href="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
		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"/>.
		'';
		};
		};
		@@ -291,7 +299,7 @@ in {
		type = types.int;
		default = 3600;
		description = ''
		How often the folders should be rescaned for changes.
		How often the folder should be rescanned for changes.
		'';
		};

		@@ -299,8 +307,8 @@ in {
		type = types.enum [ "sendreceive" "sendonly" "receiveonly" ];
		default = "sendreceive";
		description = ''
		Whether to send only changes from this folder, only receive them
		or propagate both.
		Whether to only send changes for this folder, only receive them
		or both.
		'';
		};

		@@ -324,7 +332,7 @@ in {
		type = types.bool;
		default = true;
		description = ''
		Whether to propagate permission changes.
		Whether to ignore permission changes.
		'';
		};

		@@ -332,9 +340,8 @@ in {
		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>.
		Whether to skip deleting files that are deleted by peers.
		See <link xlink:href="https://docs.syncthing.net/advanced/folder-ignoredelete.html"/>.
		'';
		};
		};
		@@ -346,43 +353,47 @@ in {
		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";
		};
		};
		};

		guiAddress = mkOption {
		type = types.str;
		default = "127.0.0.1:8384";
		description = ''
		Address to serve the GUI.
		The address to serve the web interface at.
		'';
		};

		systemService = mkOption {
		type = types.bool;
		default = true;
		description = "Auto launch Syncthing as a system service.";
		description = ''
		Whether to auto-launch Syncthing as a system service.
		'';
		};

		user = mkOption {
		type = types.str;
		default = defaultUser;
		example = "yourUser";
		description = ''
		Syncthing will be run under this user (user will be created if it doesn't exist.
		This can be your user name).
		The user to run Syncthing as.
		By default, a user named <literal>${defaultUser}</literal> will be created.
		'';
		};

		group = mkOption {
		type = types.str;
		default = defaultUser;
		default = defaultGroup;
		example = "yourGroup";
		description = ''
		Syncthing will be run under this group (group will not be created if it doesn't exist.
		This can be your user name).
		The group to run Syncthing under.
		By default, a group named <literal>${defaultGroup}</literal> will be created.
		'';
		};

		@@ -391,52 +402,54 @@ in {
		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.
		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 = ''
		Path where synced directories will exist.
		The path where synchronised directories will exist.
		'';
		};

		configDir = mkOption {
		configDir = let
		cond = versionAtLeast config.system.stateVersion "19.03";
		in mkOption {
		type = types.path;
		description = ''
		Path where the settings and keys will exist.
		The 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");
		default = cfg.dataDir + (optionalString cond "/.config/syncthing");
		defaultText = literalExample "dataDir${optionalString cond " + \"/.config/syncthing\""}";
		};

		openDefaultPorts = mkOption {
		type = types.bool;
		default = false;
		example = literalExample "true";
		example = 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.
		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 = "pkgs.syncthing";
		example = literalExample "pkgs.syncthing";
		defaultText = literalExample "pkgs.syncthing";
		description = ''
		Syncthing package to use.
		The Syncthing package to use.
		'';
		};
		};
		@@ -447,7 +460,9 @@ in {
		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

		@@ -470,8 +485,8 @@ in {
		};
		};

		users.groups = mkIf (cfg.systemService && cfg.group == defaultUser) {
		${defaultUser}.gid =
		users.groups = mkIf (cfg.systemService && cfg.group == defaultGroup) {
		${defaultGroup}.gid =
		config.ids.gids.syncthing;
		};

		@@ -491,14 +506,14 @@ in {
		RestartForceExitStatus="3 4";
		User = cfg.user;
		Group = cfg.group;
		ExecStartPre = mkIf (cfg.declarative.cert != null \|\| cfg.declarative.key != null)
		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.declarative.cert != null) ''
		install -Dm400 -o ${cfg.user} -g ${cfg.group} ${toString cfg.declarative.cert} ${cfg.configDir}/cert.pem
		${optionalString (cfg.cert != null) ''
		install -Dm400 -o ${cfg.user} -g ${cfg.group} ${toString cfg.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
		${optionalString (cfg.key != null) ''
		install -Dm400 -o ${cfg.user} -g ${cfg.group} ${toString cfg.key} ${cfg.configDir}/key.pem
		''}
		''}"
		;
		@@ -529,7 +544,7 @@ in {
		};
		};
		syncthing-init = mkIf (
		cfg.declarative.devices != {} \|\| cfg.declarative.folders != {} \|\| cfg.declarative.extraOptions != {}
		cfg.devices != {} \|\| cfg.folders != {} \|\| cfg.extraOptions != {}
		) {
		description = "Syncthing configuration updater";
		after = [ "syncthing.service" ];

nixos/tests/syncthing-init.nix

+7 −9

Original line number	Diff line number	Diff line
		@@ -9,7 +9,6 @@ in {
		machine = {
		services.syncthing = {
		enable = true;
		declarative = {
		devices.testDevice = {
		id = testId;
		};
		@@ -20,7 +19,6 @@ in {
		extraOptions.gui.user = "guiUser";
		};
		};
		};

		testScript = ''
		machine.wait_for_unit("syncthing-init.service")