diff options
| author | Linus Heckemann <git@sphalerite.org> | 2020-05-22 14:12:43 +0200 |
|---|---|---|
| committer | Linus Heckemann <git@sphalerite.org> | 2020-06-18 17:23:33 +0200 |
| commit | 176bc68a699ad62156c6d727babe07fe0fe1294d (patch) | |
| tree | dc443ca9cba326e2c0d12cad4cbda7ba23ed561e /pkgs/servers | |
| parent | 3dbbc786f51eb3f74fc75b1d179b3c447e315ecc (diff) | |
| download | nixpkgs-176bc68a699ad62156c6d727babe07fe0fe1294d.tar nixpkgs-176bc68a699ad62156c6d727babe07fe0fe1294d.tar.gz nixpkgs-176bc68a699ad62156c6d727babe07fe0fe1294d.tar.bz2 nixpkgs-176bc68a699ad62156c6d727babe07fe0fe1294d.tar.lz nixpkgs-176bc68a699ad62156c6d727babe07fe0fe1294d.tar.xz nixpkgs-176bc68a699ad62156c6d727babe07fe0fe1294d.tar.zst nixpkgs-176bc68a699ad62156c6d727babe07fe0fe1294d.zip | |
mailman: log to journal
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/mail/mailman/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/servers/mail/mailman/log-stderr.patch | 13 |
2 files changed, 27 insertions, 2 deletions
diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix index 37b4d29eeb1..879fd19adb0 100644 --- a/pkgs/servers/mail/mailman/default.nix +++ b/pkgs/servers/mail/mailman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k, alembic, aiosmtpd, dnspython +{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, isPy3k, alembic, aiosmtpd, dnspython , flufl_bounce, flufl_i18n, flufl_lock, lazr_config, lazr_delegates, passlib , requests, zope_configuration, click, falcon, importlib-resources , zope_component, lynx, postfix, authheaders, gunicorn @@ -20,7 +20,19 @@ buildPythonPackage rec { zope_component authheaders gunicorn ]; - patchPhase = '' + patches = [ + (fetchpatch { + url = https://gitlab.com/mailman/mailman/-/commit/4b206e2a5267a0e17f345fd7b2d957122ba57566.patch; + sha256 = "06axmrn74p81wvcki36c7gfj5fp5q15zxz2yl3lrvijic7hbs4n2"; + }) + (fetchpatch { + url = https://gitlab.com/mailman/mailman/-/commit/9613154f3c04fa2383fbf017031ef263c291418d.patch; + sha256 = "0vyw87s857vfxbf7kihwb6w094xyxmxbi1bpdqi3ybjamjycp55r"; + }) + ./log-stderr.patch + ]; + + postPatch = '' substituteInPlace src/mailman/config/postfix.cfg \ --replace /usr/sbin/postmap ${postfix}/bin/postmap substituteInPlace src/mailman/config/schema.cfg \ diff --git a/pkgs/servers/mail/mailman/log-stderr.patch b/pkgs/servers/mail/mailman/log-stderr.patch new file mode 100644 index 00000000000..2edbe1f1831 --- /dev/null +++ b/pkgs/servers/mail/mailman/log-stderr.patch @@ -0,0 +1,13 @@ +diff --git a/src/mailman/core/logging.py b/src/mailman/core/logging.py +index f8f87279f..7ff13b003 100644 +--- a/src/mailman/core/logging.py ++++ b/src/mailman/core/logging.py +@@ -142,6 +142,8 @@ def _init_logger(propagate, sub_name, log, logger_config): + address, facility = _get_syslog_params(logger_config) + handler = logging.handlers.SysLogHandler( + address=address, facility=facility) ++ elif logger_config.handler == 'stderr': ++ handler = logging.StreamHandler(sys.stderr) + else: + path_str = logger_config.path + path_abs = os.path.normpath(os.path.join(config.LOG_DIR, path_str)) |