From 8feca24b106b0f4236add0689214a7fc075cde8f Mon Sep 17 00:00:00 2001 From: Hendrik Jaeger Date: Wed, 3 Jul 2024 12:14:30 +0200 Subject: [PATCH] fix template and deploy config file again --- manifests/init.pp | 4 ++++ .../logcheck/{logcheck.conf => logcheck.conf.erb} | 13 ++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) rename templates/etc/logcheck/{logcheck.conf => logcheck.conf.erb} (81%) diff --git a/manifests/init.pp b/manifests/init.pp index 71e6f88..a353b9e 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -7,6 +7,10 @@ class logcheck ( ; } file { + '/etc/logcheck/logcheck.conf': + ensure => present, + content => template('logcheck/etc/logcheck/logcheck.conf.erb'), + ; '/etc/logcheck/ignore.d.server/': ensure => directory, source => 'puppet:///modules/logcheck/etc/logcheck/ignore.d.server/', diff --git a/templates/etc/logcheck/logcheck.conf b/templates/etc/logcheck/logcheck.conf.erb similarity index 81% rename from templates/etc/logcheck/logcheck.conf rename to templates/etc/logcheck/logcheck.conf.erb index 8509ea3..43cb5a6 100644 --- a/templates/etc/logcheck/logcheck.conf +++ b/templates/etc/logcheck/logcheck.conf.erb @@ -19,7 +19,7 @@ # Can be Set to "workstation", "server" or "paranoid" for different # levels of filtering. Defaults to server if not set. -REPORTLEVEL="<%= reportlevel %>" +REPORTLEVEL="<%= @reportlevel %>" # Controls the address mail goes to: # *NOTE* the script does not set a default value for this variable! @@ -71,6 +71,17 @@ FQDN=1 #ADDTAG="no" +# Previous versions of logcheck always sent messages in 7bit encoding, +# even if that resulted in RFC-violating messages. For example, really +# long syslog lines would generate too-long SMTP lines, which are +# rejected at least by Debian's default exim configuration. The new +# default is to let mime-construct pick an appropriate encoding, but you +# can override it by setting the below (to any of the encodings +# supported by mime-construct). You may need to do this if you have +# tools handling logcheck emails that don't understand MIME encoding. + +#MIMEENCODING= + # Set a different location for temporary files than /tmp # this is useful if your /tmp is small and you are getting # errors such as: -- 2.39.5