JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sympa: build with --enable-fhs

Browse Source 
Update module accordingly.
This commit is contained in:
Martin Milata 2020-03-21 13:55:53 +01:00
parent adc7388930
commit 8f632b404f
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/modules/services/mail/sympa.nix
View File

@ -415,7 +415,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 +497,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 +518,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 +550,7 @@ in
args = [ args = [
"flags=hqRu" "flags=hqRu"
"user=${user}" "user=${user}"
"argv=${pkg}/bin/queue" "argv=${pkg}/libexec/queue"
"\${nexthop}" "\${nexthop}"
]; ];
}; };
@ -562,7 +562,7 @@ in
args = [ args = [
"flags=hqRu" "flags=hqRu"
"user=${user}" "user=${user}"
"argv=${pkg}/bin/bouncequeue" "argv=${pkg}/libexec/bouncequeue"
"\${nexthop}" "\${nexthop}"
]; ];
}; };

1
pkgs/servers/mail/sympa/default.nix
View File

@ -73,6 +73,7 @@ stdenv.mkDerivation rec {
}; };
configureFlags = [ configureFlags = [
"--enable-fhs"
"--without-initdir" "--without-initdir"
"--without-unitsdir" "--without-unitsdir"
"--without-smrshdir" "--without-smrshdir"