public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minidlna: use journalctl for logging, systemd for runtimedir

Browse Source
This commit is contained in:
Alexander Ried 2016-04-08 22:37:11 +02:00
parent 4d87926795
commit 72cd570421
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nixos/modules/services/networking/minidlna.nix
View File

@ -60,7 +60,7 @@ in
port=${toString port} port=${toString port}
friendly_name=${config.networking.hostName} MiniDLNA friendly_name=${config.networking.hostName} MiniDLNA
db_dir=/var/cache/minidlna db_dir=/var/cache/minidlna
log_dir=/var/log/minidlna log_level=warn
inotify=yes inotify=yes
${concatMapStrings (dir: '' ${concatMapStrings (dir: ''
media_dir=${dir} media_dir=${dir}
@ -83,21 +83,18 @@ in
preStart = preStart =
'' ''
mkdir -p /var/cache/minidlna /var/log/minidlna /run/minidlna mkdir -p /var/cache/minidlna
chown minidlna /var/cache/minidlna /var/log/minidlna /run/minidlna chown -R minidlna:minidlna /var/cache/minidlna
''; '';
# FIXME: log through the journal rather than
# /var/log/minidlna. The -d flag does that, but also raises
# the log level to debug...
serviceConfig = serviceConfig =
{ User = "minidlna"; { User = "minidlna";
Group = "nogroup"; Group = "minidlna";
PermissionsStartOnly = true; PermissionsStartOnly = true;
Type = "forking"; RuntimeDirectory = "minidlna";
PIDFile = "/run/minidlna/pid"; PIDFile = "/run/minidlna/pid";
ExecStart = ExecStart =
"@${pkgs.minidlna}/sbin/minidlnad minidlnad -P /run/minidlna/pid" + "${pkgs.minidlna}/sbin/minidlnad -S -P /run/minidlna/pid" +
" -f ${pkgs.writeText "minidlna.conf" cfg.config}"; " -f ${pkgs.writeText "minidlna.conf" cfg.config}";
}; };
}; };