diff options
author | Alexander Ried <ried@mytum.de> | 2016-04-08 22:37:11 +0200 |
---|---|---|
committer | Alexander Ried <ried@mytum.de> | 2016-04-08 23:04:12 +0200 |
commit | 72cd570421d4a0f00a006bc2e5fc256692069380 (patch) | |
tree | 72af7dac45863e5c09e08bd61ef83d7be8c6b7b8 /nixos/modules/services/networking/minidlna.nix | |
parent | 4d87926795c4f0db9cc4cf65dfd35a32f892cefb (diff) | |
download | nixlib-72cd570421d4a0f00a006bc2e5fc256692069380.tar nixlib-72cd570421d4a0f00a006bc2e5fc256692069380.tar.gz nixlib-72cd570421d4a0f00a006bc2e5fc256692069380.tar.bz2 nixlib-72cd570421d4a0f00a006bc2e5fc256692069380.tar.lz nixlib-72cd570421d4a0f00a006bc2e5fc256692069380.tar.xz nixlib-72cd570421d4a0f00a006bc2e5fc256692069380.tar.zst nixlib-72cd570421d4a0f00a006bc2e5fc256692069380.zip |
minidlna: use journalctl for logging, systemd for runtimedir
Diffstat (limited to 'nixos/modules/services/networking/minidlna.nix')
-rw-r--r-- | nixos/modules/services/networking/minidlna.nix | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/nixos/modules/services/networking/minidlna.nix b/nixos/modules/services/networking/minidlna.nix index bbbfe9d72e1a..61d063dbfe0e 100644 --- a/nixos/modules/services/networking/minidlna.nix +++ b/nixos/modules/services/networking/minidlna.nix @@ -60,7 +60,7 @@ in port=${toString port} friendly_name=${config.networking.hostName} MiniDLNA db_dir=/var/cache/minidlna - log_dir=/var/log/minidlna + log_level=warn inotify=yes ${concatMapStrings (dir: '' media_dir=${dir} @@ -83,21 +83,18 @@ in preStart = '' - mkdir -p /var/cache/minidlna /var/log/minidlna /run/minidlna - chown minidlna /var/cache/minidlna /var/log/minidlna /run/minidlna + mkdir -p /var/cache/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 = { User = "minidlna"; - Group = "nogroup"; + Group = "minidlna"; PermissionsStartOnly = true; - Type = "forking"; + RuntimeDirectory = "minidlna"; PIDFile = "/run/minidlna/pid"; 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}"; }; }; |