BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nixos/transmission: disable downloadDirPermissions by default

Browse source
This commit is contained in:
Julien Moutinho 2021-11-25 03:43:30 +01:00
parent ab7d727c97
commit b84beda44c
1 changed files with 27 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
nixos/modules/services/torrent/transmission.nix
View file

@ -167,13 +167,15 @@ in
}; };
downloadDirPermissions = mkOption { downloadDirPermissions = mkOption {
type = types.str; type = with types; nullOr str;
default = "770"; default = null;
example = "775"; example = "770";
description = '' description = ''
The permissions set by <literal>systemd.activationScripts.transmission-daemon</literal> If not <code>null</code>, is used as the permissions
on the directories <xref linkend="opt-services.transmission.settings.download-dir"/> set by <literal>systemd.activationScripts.transmission-daemon</literal>
and <xref linkend="opt-services.transmission.settings.incomplete-dir"/>. on the directories <xref linkend="opt-services.transmission.settings.download-dir"/>,
<xref linkend="opt-services.transmission.settings.incomplete-dir"/>.
and <xref linkend="opt-services.transmission.settings.watch-dir"/>.
Note that you may also want to change Note that you may also want to change
<xref linkend="opt-services.transmission.settings.umask"/>. <xref linkend="opt-services.transmission.settings.umask"/>.
''; '';
@ -246,15 +248,17 @@ in
# when /home/foo is not owned by cfg.user. # when /home/foo is not owned by cfg.user.
# Note also that using an ExecStartPre= wouldn't work either # Note also that using an ExecStartPre= wouldn't work either
# because BindPaths= needs these directories before. # because BindPaths= needs these directories before.
system.activationScripts.transmission-daemon = '' system.activationScripts = mkIf (cfg.downloadDirPermissions != null)
install -d -m 700 '${cfg.home}/${settingsDir}' { transmission-daemon = ''
chown -R '${cfg.user}:${cfg.group}' ${cfg.home}/${settingsDir} install -d -m 700 '${cfg.home}/${settingsDir}'
install -d -m '${cfg.downloadDirPermissions}' -o '${cfg.user}' -g '${cfg.group}' '${cfg.settings.download-dir}' chown -R '${cfg.user}:${cfg.group}' ${cfg.home}/${settingsDir}
'' + optionalString cfg.settings.incomplete-dir-enabled '' install -d -m '${cfg.downloadDirPermissions}' -o '${cfg.user}' -g '${cfg.group}' '${cfg.settings.download-dir}'
install -d -m '${cfg.downloadDirPermissions}' -o '${cfg.user}' -g '${cfg.group}' '${cfg.settings.incomplete-dir}' '' + optionalString cfg.settings.incomplete-dir-enabled ''
'' + optionalString cfg.settings.watch-dir-enabled '' install -d -m '${cfg.downloadDirPermissions}' -o '${cfg.user}' -g '${cfg.group}' '${cfg.settings.incomplete-dir}'
install -d -m '${cfg.downloadDirPermissions}' -o '${cfg.user}' -g '${cfg.group}' '${cfg.settings.watch-dir}' '' + optionalString cfg.settings.watch-dir-enabled ''
''; install -d -m '${cfg.downloadDirPermissions}' -o '${cfg.user}' -g '${cfg.group}' '${cfg.settings.watch-dir}'
'';
};
systemd.services.transmission = { systemd.services.transmission = {
description = "Transmission BitTorrent Service"; description = "Transmission BitTorrent Service";
@ -313,6 +317,14 @@ in
cfg.settings.script-torrent-done-filename ++ cfg.settings.script-torrent-done-filename ++
optional (cfg.settings.watch-dir-enabled && !cfg.settings.trash-original-torrent-files) optional (cfg.settings.watch-dir-enabled && !cfg.settings.trash-original-torrent-files)
cfg.settings.watch-dir; cfg.settings.watch-dir;
StateDirectory = [
"transmission"
"transmission/.config/transmission-daemon"
"transmission/.incomplete"
"transmission/Downloads"
"transmission/watch-dir"
];
StateDirectoryMode = mkDefault 750;
# The following options are only for optimizing: # The following options are only for optimizing:
# systemd-analyze security transmission # systemd-analyze security transmission
AmbientCapabilities = ""; AmbientCapabilities = "";