diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-07-28 06:03:38 +0200 |
---|---|---|
committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-07-28 06:22:29 +0200 |
commit | 8a1e7cd556f34ef0f8c0b2e5b73afe72264097d4 (patch) | |
tree | 2c4decb0188bbb0e64e8cf50d748713469e2d5f2 /nixos/modules | |
parent | d23521b16cf12bb94865c34673fc8317270da54c (diff) | |
download | nixlib-8a1e7cd556f34ef0f8c0b2e5b73afe72264097d4.tar nixlib-8a1e7cd556f34ef0f8c0b2e5b73afe72264097d4.tar.gz nixlib-8a1e7cd556f34ef0f8c0b2e5b73afe72264097d4.tar.bz2 nixlib-8a1e7cd556f34ef0f8c0b2e5b73afe72264097d4.tar.lz nixlib-8a1e7cd556f34ef0f8c0b2e5b73afe72264097d4.tar.xz nixlib-8a1e7cd556f34ef0f8c0b2e5b73afe72264097d4.tar.zst nixlib-8a1e7cd556f34ef0f8c0b2e5b73afe72264097d4.zip |
rspamd service: fix runtime directory, log to syslog
Fixes #17144.
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/services/mail/rspamd.nix | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix index 412b99ccc570..01f2f9e5d090 100644 --- a/nixos/modules/services/mail/rspamd.nix +++ b/nixos/modules/services/mail/rspamd.nix @@ -8,7 +8,7 @@ let mkBindSockets = socks: concatStringsSep "\n" (map (each: " bind_socket = \"${each}\"") socks); - rspamdConf = + rspamdConfFile = pkgs.writeText "rspamd.conf" '' .include "$CONFDIR/common.conf" @@ -18,8 +18,7 @@ let } logging { - type = "file"; - filename = "$LOGDIR/rspamd.log"; + type = "syslog"; .include "$CONFDIR/logging.inc" } @@ -33,7 +32,6 @@ let .include "$CONFDIR/worker-controller.inc" } ''; - rspamdConfFile = pkgs.writeText "rspamd.conf" rspamdConf; in @@ -58,7 +56,7 @@ in bindSocket = mkOption { type = types.listOf types.str; default = [ - "/run/rspamd.sock mode=0666 owner=${cfg.user}" + "/run/rspamd/rspamd.sock mode=0666 owner=${cfg.user}" ]; description = '' List of sockets to listen, in format acceptable by rspamd @@ -128,13 +126,13 @@ in serviceConfig = { ExecStart = "${pkgs.rspamd}/bin/rspamd ${optionalString cfg.debug "-d"} --user=${cfg.user} --group=${cfg.group} --pid=/run/rspamd.pid -c ${rspamdConfFile} -f"; - RuntimeDirectory = "/var/lib/rspamd"; - PermissionsStartOnly = true; Restart = "always"; + RuntimeDirectory = "rspamd"; + PrivateTmp = true; }; preStart = '' - ${pkgs.coreutils}/bin/mkdir -p /var/{lib,log}/rspamd + ${pkgs.coreutils}/bin/mkdir -p /var/lib/rspamd ${pkgs.coreutils}/bin/chown ${cfg.user}:${cfg.group} /var/lib/rspamd ''; |