diff options
| author | Silvan Mosberger <contact@infinisil.com> | 2020-04-03 00:24:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-03 00:24:57 +0200 |
| commit | c06bcddaad5ca569e1b3551cda341e138c4700b3 (patch) | |
| tree | ab15c918cfa599220bef8f79722131b0b7864fe8 /nixos | |
| parent | 44c20fb83e180182c6237f8abac8c6bf9e5f4296 (diff) | |
| parent | fdc36e2c89759db3bbf9d5fe2648c31b7988dbca (diff) | |
| download | nixlib-c06bcddaad5ca569e1b3551cda341e138c4700b3.tar nixlib-c06bcddaad5ca569e1b3551cda341e138c4700b3.tar.gz nixlib-c06bcddaad5ca569e1b3551cda341e138c4700b3.tar.bz2 nixlib-c06bcddaad5ca569e1b3551cda341e138c4700b3.tar.lz nixlib-c06bcddaad5ca569e1b3551cda341e138c4700b3.tar.xz nixlib-c06bcddaad5ca569e1b3551cda341e138c4700b3.tar.zst nixlib-c06bcddaad5ca569e1b3551cda341e138c4700b3.zip | |
Merge pull request #83258 from mmilata/sympa-6.2.54
nixos/sympa: fix outgoing emails, update package version
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/mail/sympa.nix | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/nixos/modules/services/mail/sympa.nix b/nixos/modules/services/mail/sympa.nix index c3ae9d4255b0..0cad09927b2f 100644 --- a/nixos/modules/services/mail/sympa.nix +++ b/nixos/modules/services/mail/sympa.nix @@ -25,8 +25,6 @@ let StateDirectory = "sympa"; ProtectHome = true; ProtectSystem = "full"; - ProtectKernelTunables = true; - ProtectKernelModules = true; ProtectControlGroups = true; }; @@ -415,7 +413,7 @@ in # force-copy static_content so it's up to date with package # set permissions for wwsympa which needs write access (...) "R ${dataDir}/static_content - - - - -" - "C ${dataDir}/static_content 0711 ${user} ${group} - ${pkg}/static_content" + "C ${dataDir}/static_content 0711 ${user} ${group} - ${pkg}/var/lib/sympa/static_content" "e ${dataDir}/static_content/* 0711 ${user} ${group} - -" "d /run/sympa 0755 ${user} ${group} - -" @@ -497,7 +495,7 @@ in -F ${toString cfg.web.fcgiProcs} \ -P /run/sympa/wwsympa.pid \ -s /run/sympa/wwsympa.socket \ - -- ${pkg}/bin/wwsympa.fcgi + -- ${pkg}/lib/sympa/cgi/wwsympa.fcgi ''; } // commonServiceConfig; @@ -518,7 +516,7 @@ in fastcgi_split_path_info ^(${loc})(.*)$; fastcgi_param PATH_INFO $fastcgi_path_info; - fastcgi_param SCRIPT_FILENAME ${pkg}/bin/wwsympa.fcgi; + fastcgi_param SCRIPT_FILENAME ${pkg}/lib/sympa/cgi/wwsympa.fcgi; ''; }) // { "/static-sympa/".alias = "${dataDir}/static_content/"; @@ -550,7 +548,7 @@ in args = [ "flags=hqRu" "user=${user}" - "argv=${pkg}/bin/queue" + "argv=${pkg}/libexec/queue" "\${nexthop}" ]; }; @@ -562,7 +560,7 @@ in args = [ "flags=hqRu" "user=${user}" - "argv=${pkg}/bin/bouncequeue" + "argv=${pkg}/libexec/bouncequeue" "\${nexthop}" ]; }; |