From 971f5ab0b67ef8c112c4e9b7308a77dfc9ed9c38 Mon Sep 17 00:00:00 2001 From: Daniel Langbein Date: Sat, 30 Sep 2023 23:20:39 +0200 Subject: [PATCH] fix: journalwatch config --- modules/journalwatch.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/journalwatch.nix b/modules/journalwatch.nix index 638a579..e3669f7 100644 --- a/modules/journalwatch.nix +++ b/modules/journalwatch.nix @@ -45,6 +45,10 @@ # If the value of `match` starts and ends with a forward-slash, it is interpreted as a regular expression, if not, it's an exact match. # `filters` are always regular expressions. # All regular expressions have to match the full string! + # + # TODO: A "\s" in the double-quoted string `match` is inserted as `s` in the generated config file! We have to use "\\s" to insert `\s`. + # TODO: A ''\s'' in the multiline string `filter` is inserted as `\s` in the generated config file. + # filterBlocks = [ # @@ -89,7 +93,7 @@ filters = '' .* ''; - match = "CONTAINER_NAME = /(docker-compose-btp-proxy-1|nc_web_[^_-\s]+)/"; + match = "CONTAINER_NAME = /(docker-compose-btp-proxy-1|nc_web_[^_-\\s]+)/"; } { # yodaNas # TODO: Open issue on GitHub https://github.com/nginx-proxy/nginx-proxy/issues/1256. Maybe set env variable RESOLVERS=1.1.1.1? @@ -107,7 +111,7 @@ filters = '' .* ''; - match = "IMAGE_NAME = /(p1st/docker-gen:.+|nginxproxy/acme-companion|biketripplanner/digitransit-ui:.+|thetorproject/snowflake-proxy:.+)/"; + match = "IMAGE_NAME = /(p1st/docker-gen:.+|nginxproxy/acme-companion|biketripplanner/digitransit-ui:.+|thetorproject/snowflake-proxy:.+|collabora/code)/"; } { # yodaNas filters = ''