From 679e170dce5b3b267a63157be9afe7c539ae9c39 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Wed, 18 Oct 2023 15:09:36 +0200 Subject: [PATCH] evolinux-base: use separate default config file for rsyslog --- CHANGELOG.md | 1 + evolinux-base/files/logs/rsyslog.conf | 122 ------------------ .../logs/rsyslog.d/10-evolinux-default.conf | 13 ++ evolinux-base/tasks/logs.yml | 6 +- 4 files changed, 17 insertions(+), 125 deletions(-) delete mode 100644 evolinux-base/files/logs/rsyslog.conf create mode 100644 evolinux-base/files/logs/rsyslog.d/10-evolinux-default.conf diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a4c9e60..8ebb68f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -56,6 +56,7 @@ The **patch** part changes is incremented if multiple releases happen the same m ### Changed +* evolinux-base: use separate default config file for rsyslog * all: change syntax "become: [yes,no]" → "become: [true,false]" * all: change syntax "force: [yes,no]" → "force: [true,false]" * elasticsearch: improve networking configuration diff --git a/evolinux-base/files/logs/rsyslog.conf b/evolinux-base/files/logs/rsyslog.conf deleted file mode 100644 index 9c2a2d22..00000000 --- a/evolinux-base/files/logs/rsyslog.conf +++ /dev/null @@ -1,122 +0,0 @@ -# Syslog for Pack Evolix serveur - Debian Squeeze - - -################# -#### MODULES #### -################# - -$ModLoad imuxsock # provides support for local system logging -$ModLoad imklog # provides kernel logging support (previously done by rklogd) -#$ModLoad immark # provides --MARK-- message capability - -# provides UDP syslog reception -#$ModLoad imudp -#$UDPServerRun 514 - -# provides TCP syslog reception -#$ModLoad imtcp -#$InputTCPServerRun 514 - - -########################### -#### GLOBAL DIRECTIVES #### -########################### - -# -# Use traditional timestamp format. -# To enable high precision timestamps, comment out the following line. -# -$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat - -# -# Set the default permissions for all log files. -# -$FileOwner root -$FileGroup adm -$FileCreateMode 0640 -$DirCreateMode 0755 -$Umask 0022 - -# -# Include all config files in /etc/rsyslog.d/ -# -$IncludeConfig /etc/rsyslog.d/*.conf - - -############### -#### RULES #### -############### - -# -# First some standard log files. Log by facility. -# -auth,authpriv.* /var/log/auth.log -*.*;auth,authpriv.none;cron,mail,local4,local5.none -/var/log/syslog -cron.* /var/log/cron.log -daemon.* -/var/log/daemon.log -kern.* -/var/log/kern.log -lpr.* -/var/log/lpr.log -mail.* -/var/log/mail.log -user.* -/var/log/user.log -uucp.* /var/log/uucp.log -news.* /var/log/news.log - -local4.* -/var/log/openldap.log -local1.* /var/log/sympa.log -local0.* /var/log/postgresql.log -local7.* -/var/log/dhcp.log -local5.* -/var/log/haproxy.log - - -# -# Logging for the mail system. Split it up so that -# it is easy to write scripts to parse these files. -# -#mail.info -/var/log/mail.info -#mail.warn -/var/log/mail.warn -#mail.err /var/log/mail.err - -# -# Logging for INN news system. -# -#news.crit /var/log/news/news.crit -#news.err /var/log/news/news.err -#news.notice -/var/log/news/news.notice - -# -# Some "catch-all" log files. -# -#*.=debug;\ -# auth,authpriv.none;\ -# news.none;mail.none -/var/log/debug -#*.=info;*.=notice;*.=warn;\ -# auth,authpriv.none;\ -# cron,daemon.none;\ -# mail,news.none -/var/log/messages - -# -# Emergencies are sent to everybody logged in. -# -*.emerg * - -# -# I like to have messages displayed on the console, but only on a virtual -# console I usually leave idle. -# -#daemon,mail.*;\ -# news.=crit;news.=err;news.=notice;\ -# *.=debug;*.=info;\ -# *.=notice;*.=warn /dev/tty8 - -# The named pipe /dev/xconsole is for the `xconsole' utility. To use it, -# you must invoke `xconsole' with the `-file' option: -# -# $ xconsole -file /dev/xconsole [...] -# -# NOTE: adjust the list below, or you'll go crazy if you have a reasonably -# busy site.. -# -#daemon.*;mail.*;\ -# news.err;\ -# *.=debug;*.=info;\ -# *.=notice;*.=warn |/dev/xconsole diff --git a/evolinux-base/files/logs/rsyslog.d/10-evolinux-default.conf b/evolinux-base/files/logs/rsyslog.d/10-evolinux-default.conf new file mode 100644 index 00000000..c072df40 --- /dev/null +++ b/evolinux-base/files/logs/rsyslog.d/10-evolinux-default.conf @@ -0,0 +1,13 @@ +# RSyslog for Pack Evolix serveur - Debian Bookworm + +daemon.* action(type="omfile" file="/var/log/daemon.log") +lpr.* action(type="omfile" file="/var/log/lpr.log") +news.* action(type="omfile" file="/var/log/news.log") +uucp.* action(type="omfile" file="/var/log/uucp.log") + +local0.* action(type="omfile" file="/var/log/postgresql.log") +local1.* action(type="omfile" file="/var/log/sympa.log") +# To be explicit we specify “sync="off"” even though it's the default +local4.* action(type="omfile" sync="off" file="/var/log/openldap.log") +local5.* action(type="omfile" sync="off" file="/var/log/haproxy.log") +local7.* action(type="omfile" file="/var/log/dhcp.log") diff --git a/evolinux-base/tasks/logs.yml b/evolinux-base/tasks/logs.yml index 75978711..46ada1d2 100644 --- a/evolinux-base/tasks/logs.yml +++ b/evolinux-base/tasks/logs.yml @@ -3,10 +3,10 @@ # TODO: voir comment faire des backups initiaux des fichiers # RSyslog -- name: Copy rsyslog.conf +- name: Copy rsyslog evolinux defaut conf ansible.builtin.copy: - src: logs/rsyslog.conf - dest: /etc/rsyslog.conf + src: logs/rsyslog.d/10-evolinux-default.conf + dest: /etc/rsyslog.d/10-evolinux-default.conf mode: "0644" notify: restart rsyslog when: evolinux_logs_rsyslog_conf | bool