From 50d1e137a5fdad0c253fe9882f86030b7abc6b2b Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Fri, 18 Apr 2025 19:49:48 +0200
Subject: syslog: T7367: ensure rsyslog is registered as default systemd syslog
 service

Systemd states:
The default syslog implementation should make syslog.service a symlink to
itself, so that this socket activates the right actual syslog service.
---
 src/init/vyos-router | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src')

diff --git a/src/init/vyos-router b/src/init/vyos-router
index 081adf214..8584234b3 100755
--- a/src/init/vyos-router
+++ b/src/init/vyos-router
@@ -460,6 +460,14 @@ start ()
     nfct helper add tns inet6 tcp
     nft --file /usr/share/vyos/vyos-firewall-init.conf || log_failure_msg "could not initiate firewall rules"
 
+    # Ensure rsyslog is the default syslog daemon
+    SYSTEMD_SYSLOG="/etc/systemd/system/syslog.service"
+    SYSTEMD_RSYSLOG="/lib/systemd/system/rsyslog.service"
+    if [ ! -L ${SYSTEMD_SYSLOG} ] || [ "$(readlink -f ${SYSTEMD_SYSLOG})" != "${SYSTEMD_RSYSLOG}" ]; then
+        ln -sf ${SYSTEMD_RSYSLOG} ${SYSTEMD_SYSLOG}
+        systemctl daemon-reload
+    fi
+
     # As VyOS does not execute commands that are not present in the CLI we call
     # the script by hand to have a single source for the login banner and MOTD
     ${vyos_conf_scripts_dir}/system_syslog.py || log_failure_msg "could not reset syslog"
-- 
cgit v1.2.3


From b5406516ccd845eeb3b33529b31ca81a319f16d7 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Fri, 18 Apr 2025 19:51:53 +0200
Subject: syslog: T7367: use generic systemd syslog.service over
 rsyslog.service

---
 python/vyos/defaults.py           | 2 +-
 src/conf_mode/system_host-name.py | 2 +-
 src/conf_mode/system_syslog.py    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/python/vyos/defaults.py b/python/vyos/defaults.py
index 2b08ff68e..7efccded6 100644
--- a/python/vyos/defaults.py
+++ b/python/vyos/defaults.py
@@ -43,7 +43,7 @@ directories = {
 }
 
 systemd_services = {
-    'rsyslog' : 'rsyslog.service',
+    'syslog' : 'syslog.service',
     'snmpd' : 'snmpd.service',
 }
 
diff --git a/src/conf_mode/system_host-name.py b/src/conf_mode/system_host-name.py
index fef034d1c..de4accda2 100755
--- a/src/conf_mode/system_host-name.py
+++ b/src/conf_mode/system_host-name.py
@@ -175,7 +175,7 @@ def apply(config):
 
     # Restart services that use the hostname
     if hostname_new != hostname_old:
-        tmp = systemd_services['rsyslog']
+        tmp = systemd_services['syslog']
         call(f'systemctl restart {tmp}')
 
     # If SNMP is running, restart it too
diff --git a/src/conf_mode/system_syslog.py b/src/conf_mode/system_syslog.py
index 414bd4b6b..bdab09f3c 100755
--- a/src/conf_mode/system_syslog.py
+++ b/src/conf_mode/system_syslog.py
@@ -35,7 +35,7 @@ rsyslog_conf = '/run/rsyslog/rsyslog.conf'
 logrotate_conf = '/etc/logrotate.d/vyos-rsyslog'
 
 systemd_socket = 'syslog.socket'
-systemd_service = systemd_services['rsyslog']
+systemd_service = systemd_services['syslog']
 
 def get_config(config=None):
     if config:
-- 
cgit v1.2.3