b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #83258 from mmilata/sympa-6.2.54

Browse source 
nixos/sympa: fix outgoing emails, update package version
This commit is contained in:
Silvan Mosberger 2020-04-03 00:24:57 +02:00 committed by GitHub
parent 44c20fb83e fdc36e2c89
commit c06bcddaad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
nixos/modules/services/mail/sympa.nix
View file

@ -25,8 +25,6 @@ let
StateDirectory = "sympa"; StateDirectory = "sympa";
ProtectHome = true; ProtectHome = true;
ProtectSystem = "full"; ProtectSystem = "full";
ProtectKernelTunables = true;
ProtectKernelModules = true;
ProtectControlGroups = true; ProtectControlGroups = true;
}; };
@ -415,7 +413,7 @@ in
# force-copy static_content so it's up to date with package # force-copy static_content so it's up to date with package
# set permissions for wwsympa which needs write access (...) # set permissions for wwsympa which needs write access (...)
"R ${dataDir}/static_content - - - - -" "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} - -" "e ${dataDir}/static_content/* 0711 ${user} ${group} - -"
"d /run/sympa 0755 ${user} ${group} - -" "d /run/sympa 0755 ${user} ${group} - -"
@ -497,7 +495,7 @@ in
-F ${toString cfg.web.fcgiProcs} \ -F ${toString cfg.web.fcgiProcs} \
-P /run/sympa/wwsympa.pid \ -P /run/sympa/wwsympa.pid \
-s /run/sympa/wwsympa.socket \ -s /run/sympa/wwsympa.socket \
-- ${pkg}/bin/wwsympa.fcgi -- ${pkg}/lib/sympa/cgi/wwsympa.fcgi
''; '';
} // commonServiceConfig; } // commonServiceConfig;
@ -518,7 +516,7 @@ in
fastcgi_split_path_info ^(${loc})(.*)$; fastcgi_split_path_info ^(${loc})(.*)$;
fastcgi_param PATH_INFO $fastcgi_path_info; 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/"; "/static-sympa/".alias = "${dataDir}/static_content/";
@ -550,7 +548,7 @@ in
args = [ args = [
"flags=hqRu" "flags=hqRu"
"user=${user}" "user=${user}"
"argv=${pkg}/bin/queue" "argv=${pkg}/libexec/queue"
"\${nexthop}" "\${nexthop}"
]; ];
}; };
@ -562,7 +560,7 @@ in
args = [ args = [
"flags=hqRu" "flags=hqRu"
"user=${user}" "user=${user}"
"argv=${pkg}/bin/bouncequeue" "argv=${pkg}/libexec/bouncequeue"
"\${nexthop}" "\${nexthop}"
]; ];
}; };

12
pkgs/servers/mail/sympa/default.nix
View file

@ -1,5 +1,4 @@
{ stdenv, perl, fetchFromGitHub, autoreconfHook { stdenv, perl, fetchFromGitHub, autoreconfHook, nixosTests }:
}:
let let
dataDir = "/var/lib/sympa"; dataDir = "/var/lib/sympa";
@ -64,16 +63,17 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sympa"; pname = "sympa";
version = "6.2.52"; version = "6.2.54";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sympa-community"; owner = "sympa-community";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "071kx6ryifs2f6fhfky9g297frzp5584kn444af1vb2imzydsbnh"; sha256 = "07wfvr8rrg7pwkl2zglrdri7n42rl9gwrjbaffb8m37wq67s7fca";
}; };
configureFlags = [ configureFlags = [
"--enable-fhs"
"--without-initdir" "--without-initdir"
"--without-unitsdir" "--without-unitsdir"
"--without-smrshdir" "--without-smrshdir"
@ -106,6 +106,10 @@ stdenv.mkDerivation rec {
rm -rf "$TMP/bin" rm -rf "$TMP/bin"
''; '';
passthru.tests = {
inherit (nixosTests) sympa;
};
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Open source mailing list manager"; description = "Open source mailing list manager";
homepage = "https://www.sympa.org"; homepage = "https://www.sympa.org";