Merge branch 'master' of ssh://git.netwichtig.de/user/henk/code/configs/puppet_modules

diff --git a/files/etc/logcheck/ignore.d.workstation/local-wpasupplicant b/files/etc/logcheck/ignore.d.workstation/local-wpasupplicant
index 963e0d944df7185f60faa1b1f2ffa203cbef93a3..f63ab829dd682624f6f7e6312f9ec46220f3e697 100644 (file)
--- a/files/etc/logcheck/ignore.d.workstation/local-wpasupplicant
+++ b/files/etc/logcheck/ignore.d.workstation/local-wpasupplicant
@@ -26,4 +26,4 @@
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ wpa_supplicant\[[0-9]+\]: ((wlan[0-9]|wlp[0-9]s[0-9]): )?WPA: Key negotiation completed with ([0-9a-f]{2}:){5}[0-9a-f]{2} \[PTK=(CCMP|TKIP) GTK=(CCMP|TKIP)\]$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ wpa_supplicant\[[0-9]+\]: (wlan[0-9]*: )?WPA: Group rekeying completed with ([0-9a-f]{2}:){5}[0-9a-f]{2} \[GTK=(CCMP|TKIP)\]$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ wpa_supplicant\[[0-9]+\]: WPS-AP-AVAILABLE$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ wpa_supplicant\[[0-9]+\]: (wlan[0-9]|wlp[0-9]s[0-9]): PMKSA-CACHE-REMOVED [[:xdigit:]:]+ 0$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ wpa_supplicant\[[0-9]+\]: (wlan[0-9]|wlp[0-9]s[0-9]): PMKSA-CACHE-(REMOVED|ADDED) [[:xdigit:]:]+ 0$