diff -Nur --no-dereference e-smith-base-5.8.1.old/createlinks e-smith-base-5.8.1/createlinks --- e-smith-base-5.8.1.old/createlinks 2022-02-11 17:42:10.877000000 -0500 +++ e-smith-base-5.8.1/createlinks 2022-02-17 17:04:06.915000000 -0500 @@ -109,6 +109,24 @@ logrotate e-smith-base-update )); +templates2events("/etc/logrotate.conf", qw( + console-save + bootstrap-console-save + post-install + post-upgrade + email-update + logrotate + e-smith-base-update + )); +templates2events("/etc/systemd/journald.conf", qw( + console-save + bootstrap-console-save + post-install + post-upgrade + email-update + logrotate + e-smith-base-update + )); templates2events("/etc/updatedb.conf", qw( bootstrap-console-save e-smith-base-update @@ -264,24 +282,6 @@ templates2events("/etc/lynx.cfg", qw(console-save bootstrap-console-save e-smith-base-update)); templates2events("/etc/elinks.conf", qw(bootstrap-console-save e-smith-base-update)); -# -# Set up generic logfile timestamp renaming/symlinking - -foreach (qw( - /var/log/messages - /var/log/boot.log - /var/log/secure - /var/log/cron - /var/log/spooler - /var/log/maillog - )) -{ - safe_touch "root/etc/e-smith/events/logrotate/logfiles2timestamp/$_"; - safe_touch "root/etc/e-smith/events/post-install/logfiles2timestamp/$_"; - safe_touch "root/etc/e-smith/events/post-upgrade/logfiles2timestamp/$_"; - safe_touch "root/etc/e-smith/events/e-smith-base-update/logfiles2timestamp/$_"; -} - #-------------------------------------------------- # functions for manager panel #-------------------------------------------------- @@ -307,7 +307,7 @@ templates2events("/usr/lib/systemd/system/dhcpd.service.d/50koozali.conf", $event); event_link("systemd-journald", $event, "02"); event_link("fix-startup", $event, "05"); -event_link("rotate_timestamped_logfiles", $event, "05"); +event_link("rotate_logfiles", $event, "05"); event_link("init-accounts", $event, "05"); event_link("set-hostname", $event, "10"); event_link("rmmod-bonding", $event, "10"); @@ -446,7 +446,7 @@ templates2events("/usr/lib/systemd/system/dhcpd.service.d/50koozali.conf", $event); event_link("systemd-journald", $event, "02"); event_link("fix-startup", $event, "05"); -event_link("rotate_timestamped_logfiles", $event, "05"); +event_link("rotate_logfiles", $event, "05"); event_link("init-accounts", $event, "05"); event_link("init-passwords", $event, "10"); event_link("conf-startup", $event, "10"); @@ -466,7 +466,7 @@ templates2events("/usr/lib/systemd/system/dhcpd.service.d/50koozali.conf", $event); event_link("systemd-journald", $event, "02"); event_link("fix-startup", $event, "05"); -event_link("rotate_timestamped_logfiles", $event, "05"); +event_link("rotate_logfiles", $event, "05"); event_link("init-accounts", $event, "05"); event_link("conf-startup", $event, "10"); event_link("user-lock-passwd", $event, "15"); @@ -583,7 +583,7 @@ $event = "logrotate"; -event_link("rotate_timestamped_logfiles", $event, "05"); +event_link("rotate_logfiles", $event, "05"); event_link("purge-old-logs", $event, "75"); safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/rsyslog"); diff -Nur --no-dereference e-smith-base-5.8.1.old/root/etc/e-smith/events/actions/purge-old-logs e-smith-base-5.8.1/root/etc/e-smith/events/actions/purge-old-logs --- e-smith-base-5.8.1.old/root/etc/e-smith/events/actions/purge-old-logs 2014-03-23 22:47:24.000000000 -0400 +++ e-smith-base-5.8.1/root/etc/e-smith/events/actions/purge-old-logs 2022-02-17 16:42:16.977000000 -0500 @@ -48,7 +48,7 @@ sub process { #------------------------------------------------------------------ - # Files older than 35 days, matching our naming scheme. + # Files older than $length days, matching our naming scheme. #------------------------------------------------------------------ if ( -f and (int(-M) > $length) and /^[A-Za-z_].*\.\d{14}$/ ) { diff -Nur --no-dereference e-smith-base-5.8.1.old/root/etc/e-smith/events/actions/rotate_logfiles e-smith-base-5.8.1/root/etc/e-smith/events/actions/rotate_logfiles --- e-smith-base-5.8.1.old/root/etc/e-smith/events/actions/rotate_logfiles 1969-12-31 19:00:00.000000000 -0500 +++ e-smith-base-5.8.1/root/etc/e-smith/events/actions/rotate_logfiles 2022-02-17 16:43:24.450000000 -0500 @@ -0,0 +1,9 @@ +#!/bin/sh + +/usr/sbin/logrotate -s /var/lib/logrotate/logrotate.status /etc/logrotate.conf +EXITVALUE=$? +if [ $EXITVALUE != 0 ]; then + /usr/bin/logger -t logrotate "ALERT exited abnormally with [$EXITVALUE]" +fi +exit 0 + diff -Nur --no-dereference e-smith-base-5.8.1.old/root/etc/e-smith/events/actions/rotate_timestamped_logfiles e-smith-base-5.8.1/root/etc/e-smith/events/actions/rotate_timestamped_logfiles --- e-smith-base-5.8.1.old/root/etc/e-smith/events/actions/rotate_timestamped_logfiles 2014-03-23 22:47:24.000000000 -0400 +++ e-smith-base-5.8.1/root/etc/e-smith/events/actions/rotate_timestamped_logfiles 1969-12-31 19:00:00.000000000 -0500 @@ -1,76 +0,0 @@ -#! /usr/bin/perl -w -#---------------------------------------------------------------------- -# copyright (C) 2003-2007 Mitel Networks Corporation -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -#---------------------------------------------------------------------- - -use strict; -use File::Find; -use File::Copy; - -sub setup_logfile_symlink; - -my $event = shift or die "Event name is required\n"; - -my $logfile_dir = "/etc/e-smith/events/$event/logfiles2timestamp"; -if (-d $logfile_dir) -{ - # Prepare log rotation if required - chdir $logfile_dir or die "Could not chdir to $logfile_dir: $!\n";; - find({ - no_chdir => 1, - follow => 0, - wanted => \&setup_logfile_symlink, - }, - '.' - ); -} - -exit 0; - -sub setup_logfile_symlink -{ - return unless -f $_; - s/^\.//; - my $filename = $_; - - # Set up filenames to be used by rsyslog. We first set up symlinks - # with known names, then use the value of the symlink when we - # expand the configuration files - my $time = time(); - - if (-f "${filename}" and ! -l "${filename}") - { - my ($sec,$min,$hour,$mday,$mon,$year) = localtime($time - 1); - my $target = sprintf("%s.%04d%02d%02d%02d%02d%02d", - $filename, $year+1900, $mon+1, $mday, $hour, $min, $sec); - move("${filename}", "${target}") or - die "Could not move ${filename} to " . - "${target}"; - } - my ($sec,$min,$hour,$mday,$mon,$year) = localtime($time); - my $target = sprintf("%s.%04d%02d%02d%02d%02d%02d", - $filename, $year+1900, $mon+1, $mday, $hour, $min, $sec); - - if (-l "${filename}") - { - unlink("${filename}") or - warn "Could not unlink ${filename}"; - } - symlink("${target}", "${filename}") or - warn "Could not symlink ${target} to ${filename}"; -} diff -Nur --no-dereference e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/logrotate.conf/05rotate e-smith-base-5.8.1/root/etc/e-smith/templates/etc/logrotate.conf/05rotate --- e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/logrotate.conf/05rotate 1969-12-31 19:00:00.000000000 -0500 +++ e-smith-base-5.8.1/root/etc/e-smith/templates/etc/logrotate.conf/05rotate 2022-02-17 16:58:03.522000000 -0500 @@ -0,0 +1,10 @@ +# see "man logrotate" for details +# rotate log files weekly +{ +#daily, weekly, monthly +$rotate=$rsyslog{'RotateDays'} || '7'; +$OUT="weekly" ; +$OUT="monthly" if ( $rotate > 21 ); +$OUT="daily" if ( $rotate == 1 ); +} + diff -Nur --no-dereference e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/logrotate.conf/10keep e-smith-base-5.8.1/root/etc/e-smith/templates/etc/logrotate.conf/10keep --- e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/logrotate.conf/10keep 1969-12-31 19:00:00.000000000 -0500 +++ e-smith-base-5.8.1/root/etc/e-smith/templates/etc/logrotate.conf/10keep 2022-02-17 16:58:03.988000000 -0500 @@ -0,0 +1,11 @@ +{ +$rotate=$rsyslog{'RotateDays'} || 7; +$purge=$rsyslog{'PurgeLength'} || 95; +$OUT.="#Remove rotated logs older than days. +maxage $purge\n\n"; +$total=$rsyslog{'KeepNumber'} || sprintf("%.0f",$purge/$rotate)||4; +$OUT.="# keep n weeks worth of backlogs +rotate $total\n"; +} +maxsize {$rsyslog{'MaxSize'} || "100M";} + diff -Nur --no-dereference e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/logrotate.conf/11notifempty e-smith-base-5.8.1/root/etc/e-smith/templates/etc/logrotate.conf/11notifempty --- e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/logrotate.conf/11notifempty 1969-12-31 19:00:00.000000000 -0500 +++ e-smith-base-5.8.1/root/etc/e-smith/templates/etc/logrotate.conf/11notifempty 2022-02-17 16:58:03.738000000 -0500 @@ -0,0 +1,3 @@ +# we de not want to collect empty rotated logs +notifempty + diff -Nur --no-dereference e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/logrotate.conf/20empty e-smith-base-5.8.1/root/etc/e-smith/templates/etc/logrotate.conf/20empty --- e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/logrotate.conf/20empty 1969-12-31 19:00:00.000000000 -0500 +++ e-smith-base-5.8.1/root/etc/e-smith/templates/etc/logrotate.conf/20empty 2022-02-17 16:58:02.389000000 -0500 @@ -0,0 +1,3 @@ +# create new (empty) log files after rotating old ones +create + diff -Nur --no-dereference e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/logrotate.conf/30extension e-smith-base-5.8.1/root/etc/e-smith/templates/etc/logrotate.conf/30extension --- e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/logrotate.conf/30extension 1969-12-31 19:00:00.000000000 -0500 +++ e-smith-base-5.8.1/root/etc/e-smith/templates/etc/logrotate.conf/30extension 2022-02-17 16:58:02.614000000 -0500 @@ -0,0 +1,3 @@ +# use date as a suffix of the rotated file +dateext + diff -Nur --no-dereference e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/logrotate.conf/35compress e-smith-base-5.8.1/root/etc/e-smith/templates/etc/logrotate.conf/35compress --- e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/logrotate.conf/35compress 1969-12-31 19:00:00.000000000 -0500 +++ e-smith-base-5.8.1/root/etc/e-smith/templates/etc/logrotate.conf/35compress 2022-02-17 16:58:02.836000000 -0500 @@ -0,0 +1,3 @@ +# uncomment this if you want your log files compressed +#compress + diff -Nur --no-dereference e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/logrotate.conf/37rpms e-smith-base-5.8.1/root/etc/e-smith/templates/etc/logrotate.conf/37rpms --- e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/logrotate.conf/37rpms 1969-12-31 19:00:00.000000000 -0500 +++ e-smith-base-5.8.1/root/etc/e-smith/templates/etc/logrotate.conf/37rpms 2022-02-17 16:58:03.064000000 -0500 @@ -0,0 +1,4 @@ +# RPM packages drop log rotation information into this directory +include /etc/logrotate.d + + diff -Nur --no-dereference e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/logrotate.conf/40included e-smith-base-5.8.1/root/etc/e-smith/templates/etc/logrotate.conf/40included --- e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/logrotate.conf/40included 1969-12-31 19:00:00.000000000 -0500 +++ e-smith-base-5.8.1/root/etc/e-smith/templates/etc/logrotate.conf/40included 2022-02-17 16:58:03.297000000 -0500 @@ -0,0 +1,16 @@ +# no packages own wtmp and btmp -- we'll rotate them here +/var/log/wtmp \{ + monthly + create 0664 root utmp + minsize 1M + rotate 1 +\} + +/var/log/btmp \{ + missingok + monthly + create 0600 root utmp + rotate 1 +\} + +# system-specific logs may be also be configured here. diff -Nur --no-dereference e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/rsyslog.conf/10modules e-smith-base-5.8.1/root/etc/e-smith/templates/etc/rsyslog.conf/10modules --- e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/rsyslog.conf/10modules 2014-03-23 22:47:23.000000000 -0400 +++ e-smith-base-5.8.1/root/etc/e-smith/templates/etc/rsyslog.conf/10modules 2022-02-11 17:56:35.715000000 -0500 @@ -6,3 +6,13 @@ # provides kernel logging support (previously done by rklogd) } $ModLoad imklog +{ +# provides --MARK-- message capability +} +$ModLoad immark +{ +# provides getting logs from journald +} +$ModLoad imjournal + + diff -Nur --no-dereference e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/rsyslog.conf/11imjournal e-smith-base-5.8.1/root/etc/e-smith/templates/etc/rsyslog.conf/11imjournal --- e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/rsyslog.conf/11imjournal 1969-12-31 19:00:00.000000000 -0500 +++ e-smith-base-5.8.1/root/etc/e-smith/templates/etc/rsyslog.conf/11imjournal 2022-02-11 17:57:31.898000000 -0500 @@ -0,0 +1,7 @@ +{ +# configuration for imjournal to import journald log +} +$ImjournalIgnorePreviousMessages on +$OmitLocalLogging off +$IMJournalStateFile imjournal.state +$SystemLogSocketName /run/systemd/journal/syslog diff -Nur --no-dereference e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/systemd/journald.conf/01header e-smith-base-5.8.1/root/etc/e-smith/templates/etc/systemd/journald.conf/01header --- e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/systemd/journald.conf/01header 1969-12-31 19:00:00.000000000 -0500 +++ e-smith-base-5.8.1/root/etc/e-smith/templates/etc/systemd/journald.conf/01header 2022-02-17 17:03:32.699000000 -0500 @@ -0,0 +1,14 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# +# Entries in this file show the compile time defaults. +# You can change settings by editing this file. +# Defaults can be restored by simply deleting this file. +# +# See journald.conf(5) for details. + + diff -Nur --no-dereference e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/systemd/journald.conf/05journal e-smith-base-5.8.1/root/etc/e-smith/templates/etc/systemd/journald.conf/05journal --- e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/systemd/journald.conf/05journal 1969-12-31 19:00:00.000000000 -0500 +++ e-smith-base-5.8.1/root/etc/e-smith/templates/etc/systemd/journald.conf/05journal 2022-02-17 17:03:32.938000000 -0500 @@ -0,0 +1 @@ +[Journal] diff -Nur --no-dereference e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/systemd/journald.conf/08dest e-smith-base-5.8.1/root/etc/e-smith/templates/etc/systemd/journald.conf/08dest --- e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/systemd/journald.conf/08dest 1969-12-31 19:00:00.000000000 -0500 +++ e-smith-base-5.8.1/root/etc/e-smith/templates/etc/systemd/journald.conf/08dest 2022-02-17 17:03:33.153000000 -0500 @@ -0,0 +1 @@ +Storage=persistent diff -Nur --no-dereference e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/systemd/journald.conf/09Compress e-smith-base-5.8.1/root/etc/e-smith/templates/etc/systemd/journald.conf/09Compress --- e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/systemd/journald.conf/09Compress 1969-12-31 19:00:00.000000000 -0500 +++ e-smith-base-5.8.1/root/etc/e-smith/templates/etc/systemd/journald.conf/09Compress 2022-02-17 17:03:33.420000000 -0500 @@ -0,0 +1 @@ +#Compress=yes diff -Nur --no-dereference e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/systemd/journald.conf/10Seal e-smith-base-5.8.1/root/etc/e-smith/templates/etc/systemd/journald.conf/10Seal --- e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/systemd/journald.conf/10Seal 1969-12-31 19:00:00.000000000 -0500 +++ e-smith-base-5.8.1/root/etc/e-smith/templates/etc/systemd/journald.conf/10Seal 2022-02-17 17:03:33.649000000 -0500 @@ -0,0 +1 @@ +#Seal=yes diff -Nur --no-dereference e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/systemd/journald.conf/11SplitMode e-smith-base-5.8.1/root/etc/e-smith/templates/etc/systemd/journald.conf/11SplitMode --- e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/systemd/journald.conf/11SplitMode 1969-12-31 19:00:00.000000000 -0500 +++ e-smith-base-5.8.1/root/etc/e-smith/templates/etc/systemd/journald.conf/11SplitMode 2022-02-17 17:03:33.880000000 -0500 @@ -0,0 +1 @@ +#SplitMode=uid diff -Nur --no-dereference e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/systemd/journald.conf/20Rates e-smith-base-5.8.1/root/etc/e-smith/templates/etc/systemd/journald.conf/20Rates --- e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/systemd/journald.conf/20Rates 1969-12-31 19:00:00.000000000 -0500 +++ e-smith-base-5.8.1/root/etc/e-smith/templates/etc/systemd/journald.conf/20Rates 2022-02-17 17:03:34.104000000 -0500 @@ -0,0 +1,3 @@ +#SyncIntervalSec=5m +#RateLimitInterval=30s +#RateLimitBurst=1000 diff -Nur --no-dereference e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/systemd/journald.conf/30System e-smith-base-5.8.1/root/etc/e-smith/templates/etc/systemd/journald.conf/30System --- e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/systemd/journald.conf/30System 1969-12-31 19:00:00.000000000 -0500 +++ e-smith-base-5.8.1/root/etc/e-smith/templates/etc/systemd/journald.conf/30System 2022-02-17 17:03:34.776000000 -0500 @@ -0,0 +1,8 @@ +#SystemMaxUse= # default 10% and not more than 4G +#SystemKeepFree= # default 15% and not more than 4G +#SystemMaxFileSize= # default 1/8 SystemMaxUse +#RuntimeMaxUse= +#RuntimeKeepFree= +#RuntimeMaxFileSize= +MaxRetentionSec={$rsyslog{'PurgeLength'} || '95'}day +MaxFileSec={$rsyslog{'RotateDays'} || '7'}day diff -Nur --no-dereference e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/systemd/journald.conf/40Forward e-smith-base-5.8.1/root/etc/e-smith/templates/etc/systemd/journald.conf/40Forward --- e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/systemd/journald.conf/40Forward 1969-12-31 19:00:00.000000000 -0500 +++ e-smith-base-5.8.1/root/etc/e-smith/templates/etc/systemd/journald.conf/40Forward 2022-02-17 17:03:34.339000000 -0500 @@ -0,0 +1,5 @@ +ForwardToSyslog=no +#ForwardToKMsg=no +#ForwardToConsole=no +#ForwardToWall=yes +#TTYPath=/dev/console diff -Nur --no-dereference e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/systemd/journald.conf/50MaxLevel e-smith-base-5.8.1/root/etc/e-smith/templates/etc/systemd/journald.conf/50MaxLevel --- e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/systemd/journald.conf/50MaxLevel 1969-12-31 19:00:00.000000000 -0500 +++ e-smith-base-5.8.1/root/etc/e-smith/templates/etc/systemd/journald.conf/50MaxLevel 2022-02-17 17:03:34.549000000 -0500 @@ -0,0 +1,6 @@ +#MaxLevelStore=debug +#MaxLevelSyslog=debug +#MaxLevelKMsg=notice +#MaxLevelConsole=info +#MaxLevelWall=emerg +#LineMax=48K diff -Nur --no-dereference e-smith-base-5.8.1.old/root/sbin/e-smith/systemd/rsyslog-pre e-smith-base-5.8.1/root/sbin/e-smith/systemd/rsyslog-pre --- e-smith-base-5.8.1.old/root/sbin/e-smith/systemd/rsyslog-pre 1969-12-31 19:00:00.000000000 -0500 +++ e-smith-base-5.8.1/root/sbin/e-smith/systemd/rsyslog-pre 2022-02-13 00:01:02.364000000 -0500 @@ -0,0 +1,16 @@ +#!/bin/bash + +# before 10.1 rsyslog was listening to /dev/log +# we want systemd-journald listen to that now +# and rsyslog to /run/systemd/journal/syslog +# will not be needed in SME 11 + +if [[ ! -S /dev/log ]]; then + #echo "no /dev/log" + /usr/bin/systemctl restart systemd-journald.socket + /usr/bin/systemctl restart systemd-journald.service +fi + +# we can now keep going with rsyslog startup +# /etc/rsyslog.conf will define the use of /run/systemd/journal/syslog + diff -Nur --no-dereference e-smith-base-5.8.1.old/root/usr/lib/systemd/system/rsyslog.service.d/51koozali.conf e-smith-base-5.8.1/root/usr/lib/systemd/system/rsyslog.service.d/51koozali.conf --- e-smith-base-5.8.1.old/root/usr/lib/systemd/system/rsyslog.service.d/51koozali.conf 2021-06-06 16:30:37.000000000 -0400 +++ e-smith-base-5.8.1/root/usr/lib/systemd/system/rsyslog.service.d/51koozali.conf 2022-02-13 00:03:56.829000000 -0500 @@ -1,3 +1,8 @@ +[Service] +ExecStartPre=-/sbin/e-smith/expand-template /etc/rsyslog.conf +ExecStartPre=-/sbin/e-smith/systemd/rsyslog-pre +ExecStartPost=-/sbin/e-smith/systemd/rsyslog-pre + [Install] WantedBy=sme-server.target