Remove rsyslogd xconsole workaround

This was added in 2013 with I68594d489ab50ef25d351162b9dcb50ca003c409
to avoid rsyslog trying to open /dev/xconsole, and is no longer
relevant.

To get back to the upstream default, remove the modified file, purge
the package and re-install it.  We can remove this shortly after it
has applied to servers.

Change-Id: Icf47abc295a6de8d43553f0a4ebdc6ce1483284e
This commit is contained in:
Ian Wienand 2020-10-08 14:26:36 +11:00
parent be8e13c139
commit e0fc90cd06
2 changed files with 14 additions and 74 deletions

View File

@ -1,69 +0,0 @@
# Default rules for rsyslog.
#
# For more information see rsyslog.conf(5) and /etc/rsyslog.conf
#
# First some standard log files. Log by facility.
#
auth,authpriv.* /var/log/auth.log
*.*;auth,authpriv.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
#
# 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 :omusrmsg:*
#
# 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..
#
# Commenting out since we don't install xconsoles on headless servers.
#daemon.*;mail.*;\
# news.err;\
# *.=debug;*.=info;\
# *.=notice;*.=warn |/dev/xconsole

View File

@ -56,12 +56,21 @@
src: debian_limits.conf
dest: /etc/security/limits.d/60-nofile-limit.conf
# NOTE(ianw): 2020-10-08: custom file no longer required; remove this
# reinstall after this has applied.
- name: Custom rsyslog config to disable /dev/xconsole noise
copy:
mode: 0644
src: rsyslog.d_50-default.conf
dest: /etc/rsyslog.d/50-default.conf
notify: Restart rsyslog
file:
path: /etc/rsyslog.d/50-default.conf
state: absent
- name: Purge rsyslog config
apt:
name: rsyslog
state: absent
purge: yes
- name: Reinstall rsyslog to get default config back
apt:
name: rsyslog
state: present
- name: Install apt-daily 10periodic file for unattended-upgrades
copy: