diff --git a/nixos/modules/services/mail/sympa.nix b/nixos/modules/services/mail/sympa.nix index c3ae9d4255b..0cad09927b2 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}" ]; }; diff --git a/pkgs/servers/mail/sympa/default.nix b/pkgs/servers/mail/sympa/default.nix index 46cbcc61f94..c5c9b440049 100644 --- a/pkgs/servers/mail/sympa/default.nix +++ b/pkgs/servers/mail/sympa/default.nix @@ -1,5 +1,4 @@ -{ stdenv, perl, fetchFromGitHub, autoreconfHook -}: +{ stdenv, perl, fetchFromGitHub, autoreconfHook, nixosTests }: let dataDir = "/var/lib/sympa"; @@ -64,16 +63,17 @@ let in stdenv.mkDerivation rec { pname = "sympa"; - version = "6.2.52"; + version = "6.2.54"; src = fetchFromGitHub { owner = "sympa-community"; repo = pname; rev = version; - sha256 = "071kx6ryifs2f6fhfky9g297frzp5584kn444af1vb2imzydsbnh"; + sha256 = "07wfvr8rrg7pwkl2zglrdri7n42rl9gwrjbaffb8m37wq67s7fca"; }; configureFlags = [ + "--enable-fhs" "--without-initdir" "--without-unitsdir" "--without-smrshdir" @@ -106,6 +106,10 @@ stdenv.mkDerivation rec { rm -rf "$TMP/bin" ''; + passthru.tests = { + inherit (nixosTests) sympa; + }; + meta = with stdenv.lib; { description = "Open source mailing list manager"; homepage = "https://www.sympa.org";