From fecf6724bb026a4891a89c33356870f83bcd76ee Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Sat, 16 Jun 2018 20:06:44 +0200
Subject: [PATCH] journalwatch: only filter broken conterinerization messages
 on strato machines

---
 roles/journalwatch/tasks/main.yml                | 4 ++--
 roles/journalwatch/{files => templates}/config   | 0
 roles/journalwatch/{files => templates}/patterns | 9 +++++++--
 3 files changed, 9 insertions(+), 4 deletions(-)
 rename roles/journalwatch/{files => templates}/config (100%)
 rename roles/journalwatch/{files => templates}/patterns (91%)

diff --git a/roles/journalwatch/tasks/main.yml b/roles/journalwatch/tasks/main.yml
index 8e64af3..cfdac0d 100644
--- a/roles/journalwatch/tasks/main.yml
+++ b/roles/journalwatch/tasks/main.yml
@@ -8,8 +8,8 @@
 - name: create journalwatch config dir
   file: path=/root/.config/journalwatch state=directory
 - name: install journalwatch config files
-  copy:
-    src: files/{{item}}
+  template:
+    src: templates/{{item}}
     dest: /root/.config/journalwatch/{{item}}
   loop:
   - config
diff --git a/roles/journalwatch/files/config b/roles/journalwatch/templates/config
similarity index 100%
rename from roles/journalwatch/files/config
rename to roles/journalwatch/templates/config
diff --git a/roles/journalwatch/files/patterns b/roles/journalwatch/templates/patterns
similarity index 91%
rename from roles/journalwatch/files/patterns
rename to roles/journalwatch/templates/patterns
index dd3b2d4..c96c19a 100644
--- a/roles/journalwatch/files/patterns
+++ b/roles/journalwatch/templates/patterns
@@ -44,9 +44,16 @@ SYSLOG_IDENTIFIER = systemd
 Received SIGRTMIN\+24 from PID .*
 (Reached target|Stopped target) .*
 Startup finished in \d+ms\.
+{% if journalwatch is defined and journalwatch.strato_broken | default(False) %}
+Failed to create /user.slice/user-\d+.slice/user@\d+.service/init.scope control group: Permission denied
+Failed to allocate manager object: Permission denied
+{% endif %}
 
 _SYSTEMD_UNIT = init.scope
 user@\d+\.service: Killing process \d+ \(kill\) with signal SIGKILL\.
+{% if journalwatch is defined and journalwatch.strato_broken | default(False) %}
+Failed to set devices.allow on /system.slice/systemd-resolved.service: Operation not permitted
+{% endif %}
 
 SYSLOG_IDENTIFIER = sudo
 \s*[_\w.-]+ : TTY=(unknown|console|(pts/|ttyp?|vc/)\d+) ; PWD=[^;]+ ; USER=[._\w-]+ ; COMMAND=.*
@@ -56,8 +63,6 @@ warning: hostname [^\s]+ does not resolve to address [\da-fA-F.:]+(: Name or ser
 warning: [._\w-]+\[[\da-fA-F.:]+\]: SASL LOGIN authentication failed: .+
 warning: non-SMTP command from \w+\[[\da-fA-F.:]+\]: .*
 warning: TLS library problem: error:[0-9A-F]+:SSL routines:\w+:(no shared cipher|decryption failed or bad record mac|unknown protocol|version too low):[\w./]+:\d+:
-Failed to create /user.slice/user-\d+.slice/user@\d+.service/init.scope control group: Permission denied
-Failed to allocate manager object: Permission denied
 
 _SYSTEMD_UNIT = dovecot.service
 auth: Warning: auth client \d+ disconnected with \d+ pending requests: (EOF|Connection reset by peer)
-- 
2.30.2