/[smeserver]/rpms/e-smith-base/sme10/e-smith-base-5.8.1-bz946-bz10484-bz11813-logs.patch
ViewVC logotype

Contents of /rpms/e-smith-base/sme10/e-smith-base-5.8.1-bz946-bz10484-bz11813-logs.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.4 - (show annotations) (download)
Mon Jun 20 04:35:52 2022 UTC (2 years, 4 months ago) by jpp
Branch: MAIN
CVS Tags: e-smith-base-5_8_1-29_el7_sme, e-smith-base-5_8_1-31_el7_sme, e-smith-base-5_8_1-28_el7_sme, e-smith-base-5_8_1-21_el7_sme, e-smith-base-5_8_1-24_el7_sme, e-smith-base-5_8_1-18_el7_sme, e-smith-base-5_8_1-23_el7_sme, e-smith-base-5_8_1-17_el7_sme, e-smith-base-5_8_1-22_el7_sme, e-smith-base-5_8_1-16_el7_sme, e-smith-base-5_8_1-19_el7_sme, e-smith-base-5_8_1-26_el7_sme, e-smith-base-5_8_1-25_el7_sme, e-smith-base-5_8_1-27_el7_sme, e-smith-base-5_8_1-20_el7_sme, e-smith-base-5_8_1-30_el7_sme, HEAD
Changes since 1.3: +1 -1 lines
* Sun Jun 19 2022 Jean-Philippe Pialasse <tests@pialasse.com> 5.8.1-16.sme
- fix /dev/log not being recreated [SME: 12073]

1 diff -Nur --no-dereference e-smith-base-5.8.1.old/createlinks e-smith-base-5.8.1/createlinks
2 --- e-smith-base-5.8.1.old/createlinks 2022-02-11 17:42:10.877000000 -0500
3 +++ e-smith-base-5.8.1/createlinks 2022-02-17 17:04:06.915000000 -0500
4 @@ -109,6 +109,24 @@
5 logrotate
6 e-smith-base-update
7 ));
8 +templates2events("/etc/logrotate.conf", qw(
9 + console-save
10 + bootstrap-console-save
11 + post-install
12 + post-upgrade
13 + email-update
14 + logrotate
15 + e-smith-base-update
16 + ));
17 +templates2events("/etc/systemd/journald.conf", qw(
18 + console-save
19 + bootstrap-console-save
20 + post-install
21 + post-upgrade
22 + email-update
23 + logrotate
24 + e-smith-base-update
25 + ));
26 templates2events("/etc/updatedb.conf", qw(
27 bootstrap-console-save
28 e-smith-base-update
29 @@ -264,24 +282,6 @@
30 templates2events("/etc/lynx.cfg", qw(console-save bootstrap-console-save e-smith-base-update));
31 templates2events("/etc/elinks.conf", qw(bootstrap-console-save e-smith-base-update));
32
33 -#
34 -# Set up generic logfile timestamp renaming/symlinking
35 -
36 -foreach (qw(
37 - /var/log/messages
38 - /var/log/boot.log
39 - /var/log/secure
40 - /var/log/cron
41 - /var/log/spooler
42 - /var/log/maillog
43 - ))
44 -{
45 - safe_touch "root/etc/e-smith/events/logrotate/logfiles2timestamp/$_";
46 - safe_touch "root/etc/e-smith/events/post-install/logfiles2timestamp/$_";
47 - safe_touch "root/etc/e-smith/events/post-upgrade/logfiles2timestamp/$_";
48 - safe_touch "root/etc/e-smith/events/e-smith-base-update/logfiles2timestamp/$_";
49 -}
50 -
51 #--------------------------------------------------
52 # functions for manager panel
53 #--------------------------------------------------
54 @@ -307,7 +307,7 @@
55 templates2events("/usr/lib/systemd/system/dhcpd.service.d/50koozali.conf", $event);
56 event_link("systemd-journald", $event, "02");
57 event_link("fix-startup", $event, "05");
58 -event_link("rotate_timestamped_logfiles", $event, "05");
59 +event_link("rotate_logfiles", $event, "05");
60 event_link("init-accounts", $event, "05");
61 event_link("set-hostname", $event, "10");
62 event_link("rmmod-bonding", $event, "10");
63 @@ -446,7 +446,7 @@
64 templates2events("/usr/lib/systemd/system/dhcpd.service.d/50koozali.conf", $event);
65 event_link("systemd-journald", $event, "02");
66 event_link("fix-startup", $event, "05");
67 -event_link("rotate_timestamped_logfiles", $event, "05");
68 +event_link("rotate_logfiles", $event, "05");
69 event_link("init-accounts", $event, "05");
70 event_link("init-passwords", $event, "10");
71 event_link("conf-startup", $event, "10");
72 @@ -466,7 +466,7 @@
73 templates2events("/usr/lib/systemd/system/dhcpd.service.d/50koozali.conf", $event);
74 event_link("systemd-journald", $event, "02");
75 event_link("fix-startup", $event, "05");
76 -event_link("rotate_timestamped_logfiles", $event, "05");
77 +event_link("rotate_logfiles", $event, "05");
78 event_link("init-accounts", $event, "05");
79 event_link("conf-startup", $event, "10");
80 event_link("user-lock-passwd", $event, "15");
81 @@ -583,7 +583,7 @@
82
83 $event = "logrotate";
84
85 -event_link("rotate_timestamped_logfiles", $event, "05");
86 +event_link("rotate_logfiles", $event, "05");
87 event_link("purge-old-logs", $event, "75");
88
89 safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/rsyslog");
90 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
91 --- e-smith-base-5.8.1.old/root/etc/e-smith/events/actions/purge-old-logs 2014-03-23 22:47:24.000000000 -0400
92 +++ e-smith-base-5.8.1/root/etc/e-smith/events/actions/purge-old-logs 2022-02-17 16:42:16.977000000 -0500
93 @@ -48,7 +48,7 @@
94 sub process
95 {
96 #------------------------------------------------------------------
97 - # Files older than 35 days, matching our naming scheme.
98 + # Files older than $length days, matching our naming scheme.
99 #------------------------------------------------------------------
100 if ( -f and (int(-M) > $length) and /^[A-Za-z_].*\.\d{14}$/ )
101 {
102 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
103 --- e-smith-base-5.8.1.old/root/etc/e-smith/events/actions/rotate_logfiles 1969-12-31 19:00:00.000000000 -0500
104 +++ e-smith-base-5.8.1/root/etc/e-smith/events/actions/rotate_logfiles 2022-02-17 16:43:24.450000000 -0500
105 @@ -0,0 +1,9 @@
106 +#!/bin/sh
107 +
108 +/usr/sbin/logrotate -s /var/lib/logrotate/logrotate.status /etc/logrotate.conf
109 +EXITVALUE=$?
110 +if [ $EXITVALUE != 0 ]; then
111 + /usr/bin/logger -t logrotate "ALERT exited abnormally with [$EXITVALUE]"
112 +fi
113 +exit 0
114 +
115 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
116 --- e-smith-base-5.8.1.old/root/etc/e-smith/events/actions/rotate_timestamped_logfiles 2014-03-23 22:47:24.000000000 -0400
117 +++ e-smith-base-5.8.1/root/etc/e-smith/events/actions/rotate_timestamped_logfiles 1969-12-31 19:00:00.000000000 -0500
118 @@ -1,76 +0,0 @@
119 -#! /usr/bin/perl -w
120 -#----------------------------------------------------------------------
121 -# copyright (C) 2003-2007 Mitel Networks Corporation
122 -#
123 -# This program is free software; you can redistribute it and/or modify
124 -# it under the terms of the GNU General Public License as published by
125 -# the Free Software Foundation; either version 2 of the License, or
126 -# (at your option) any later version.
127 -#
128 -# This program is distributed in the hope that it will be useful,
129 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
130 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
131 -# GNU General Public License for more details.
132 -#
133 -# You should have received a copy of the GNU General Public License
134 -# along with this program; if not, write to the Free Software
135 -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
136 -#
137 -#----------------------------------------------------------------------
138 -
139 -use strict;
140 -use File::Find;
141 -use File::Copy;
142 -
143 -sub setup_logfile_symlink;
144 -
145 -my $event = shift or die "Event name is required\n";
146 -
147 -my $logfile_dir = "/etc/e-smith/events/$event/logfiles2timestamp";
148 -if (-d $logfile_dir)
149 -{
150 - # Prepare log rotation if required
151 - chdir $logfile_dir or die "Could not chdir to $logfile_dir: $!\n";;
152 - find({
153 - no_chdir => 1,
154 - follow => 0,
155 - wanted => \&setup_logfile_symlink,
156 - },
157 - '.'
158 - );
159 -}
160 -
161 -exit 0;
162 -
163 -sub setup_logfile_symlink
164 -{
165 - return unless -f $_;
166 - s/^\.//;
167 - my $filename = $_;
168 -
169 - # Set up filenames to be used by rsyslog. We first set up symlinks
170 - # with known names, then use the value of the symlink when we
171 - # expand the configuration files
172 - my $time = time();
173 -
174 - if (-f "${filename}" and ! -l "${filename}")
175 - {
176 - my ($sec,$min,$hour,$mday,$mon,$year) = localtime($time - 1);
177 - my $target = sprintf("%s.%04d%02d%02d%02d%02d%02d",
178 - $filename, $year+1900, $mon+1, $mday, $hour, $min, $sec);
179 - move("${filename}", "${target}") or
180 - die "Could not move ${filename} to " .
181 - "${target}";
182 - }
183 - my ($sec,$min,$hour,$mday,$mon,$year) = localtime($time);
184 - my $target = sprintf("%s.%04d%02d%02d%02d%02d%02d",
185 - $filename, $year+1900, $mon+1, $mday, $hour, $min, $sec);
186 -
187 - if (-l "${filename}")
188 - {
189 - unlink("${filename}") or
190 - warn "Could not unlink ${filename}";
191 - }
192 - symlink("${target}", "${filename}") or
193 - warn "Could not symlink ${target} to ${filename}";
194 -}
195 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
196 --- e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/logrotate.conf/05rotate 1969-12-31 19:00:00.000000000 -0500
197 +++ e-smith-base-5.8.1/root/etc/e-smith/templates/etc/logrotate.conf/05rotate 2022-02-17 16:58:03.522000000 -0500
198 @@ -0,0 +1,10 @@
199 +# see "man logrotate" for details
200 +# rotate log files weekly
201 +{
202 +#daily, weekly, monthly
203 +$rotate=$rsyslog{'RotateDays'} || '7';
204 +$OUT="weekly" ;
205 +$OUT="monthly" if ( $rotate > 21 );
206 +$OUT="daily" if ( $rotate == 1 );
207 +}
208 +
209 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
210 --- e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/logrotate.conf/10keep 1969-12-31 19:00:00.000000000 -0500
211 +++ e-smith-base-5.8.1/root/etc/e-smith/templates/etc/logrotate.conf/10keep 2022-02-17 16:58:03.988000000 -0500
212 @@ -0,0 +1,11 @@
213 +{
214 +$rotate=$rsyslog{'RotateDays'} || 7;
215 +$purge=$rsyslog{'PurgeLength'} || 95;
216 +$OUT.="#Remove rotated logs older than <count> days.
217 +maxage $purge\n\n";
218 +$total=$rsyslog{'KeepNumber'} || sprintf("%.0f",$purge/$rotate)||4;
219 +$OUT.="# keep n weeks worth of backlogs
220 +rotate $total\n";
221 +}
222 +maxsize {$rsyslog{'MaxSize'} || "100M";}
223 +
224 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
225 --- e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/logrotate.conf/11notifempty 1969-12-31 19:00:00.000000000 -0500
226 +++ e-smith-base-5.8.1/root/etc/e-smith/templates/etc/logrotate.conf/11notifempty 2022-02-17 16:58:03.738000000 -0500
227 @@ -0,0 +1,3 @@
228 +# we de not want to collect empty rotated logs
229 +notifempty
230 +
231 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
232 --- e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/logrotate.conf/20empty 1969-12-31 19:00:00.000000000 -0500
233 +++ e-smith-base-5.8.1/root/etc/e-smith/templates/etc/logrotate.conf/20empty 2022-02-17 16:58:02.389000000 -0500
234 @@ -0,0 +1,3 @@
235 +# create new (empty) log files after rotating old ones
236 +create
237 +
238 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
239 --- e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/logrotate.conf/30extension 1969-12-31 19:00:00.000000000 -0500
240 +++ e-smith-base-5.8.1/root/etc/e-smith/templates/etc/logrotate.conf/30extension 2022-02-17 16:58:02.614000000 -0500
241 @@ -0,0 +1,3 @@
242 +# use date as a suffix of the rotated file
243 +dateext
244 +
245 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
246 --- e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/logrotate.conf/35compress 1969-12-31 19:00:00.000000000 -0500
247 +++ e-smith-base-5.8.1/root/etc/e-smith/templates/etc/logrotate.conf/35compress 2022-02-17 16:58:02.836000000 -0500
248 @@ -0,0 +1,3 @@
249 +# uncomment this if you want your log files compressed
250 +#compress
251 +
252 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
253 --- e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/logrotate.conf/37rpms 1969-12-31 19:00:00.000000000 -0500
254 +++ e-smith-base-5.8.1/root/etc/e-smith/templates/etc/logrotate.conf/37rpms 2022-02-17 16:58:03.064000000 -0500
255 @@ -0,0 +1,4 @@
256 +# RPM packages drop log rotation information into this directory
257 +include /etc/logrotate.d
258 +
259 +
260 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
261 --- e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/logrotate.conf/40included 1969-12-31 19:00:00.000000000 -0500
262 +++ e-smith-base-5.8.1/root/etc/e-smith/templates/etc/logrotate.conf/40included 2022-02-17 16:58:03.297000000 -0500
263 @@ -0,0 +1,16 @@
264 +# no packages own wtmp and btmp -- we'll rotate them here
265 +/var/log/wtmp \{
266 + monthly
267 + create 0664 root utmp
268 + minsize 1M
269 + rotate 1
270 +\}
271 +
272 +/var/log/btmp \{
273 + missingok
274 + monthly
275 + create 0600 root utmp
276 + rotate 1
277 +\}
278 +
279 +# system-specific logs may be also be configured here.
280 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
281 --- e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/rsyslog.conf/10modules 2014-03-23 22:47:23.000000000 -0400
282 +++ e-smith-base-5.8.1/root/etc/e-smith/templates/etc/rsyslog.conf/10modules 2022-02-11 17:56:35.715000000 -0500
283 @@ -6,3 +6,13 @@
284 # provides kernel logging support (previously done by rklogd)
285 }
286 $ModLoad imklog
287 +{
288 +# provides --MARK-- message capability
289 +}
290 +$ModLoad immark
291 +{
292 +# provides getting logs from journald
293 +}
294 +$ModLoad imjournal
295 +
296 +
297 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
298 --- e-smith-base-5.8.1.old/root/etc/e-smith/templates/etc/rsyslog.conf/11imjournal 1969-12-31 19:00:00.000000000 -0500
299 +++ e-smith-base-5.8.1/root/etc/e-smith/templates/etc/rsyslog.conf/11imjournal 2022-02-11 17:57:31.898000000 -0500
300 @@ -0,0 +1,7 @@
301 +{
302 +# configuration for imjournal to import journald log
303 +}
304 +$ImjournalIgnorePreviousMessages on
305 +$OmitLocalLogging off
306 +$IMJournalStateFile imjournal.state
307 +$SystemLogSocketName /run/systemd/journal/syslog
308 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
309 --- 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
310 +++ e-smith-base-5.8.1/root/etc/e-smith/templates/etc/systemd/journald.conf/01header 2022-02-17 17:03:32.699000000 -0500
311 @@ -0,0 +1,14 @@
312 +# This file is part of systemd.
313 +#
314 +# systemd is free software; you can redistribute it and/or modify it
315 +# under the terms of the GNU Lesser General Public License as published by
316 +# the Free Software Foundation; either version 2.1 of the License, or
317 +# (at your option) any later version.
318 +#
319 +# Entries in this file show the compile time defaults.
320 +# You can change settings by editing this file.
321 +# Defaults can be restored by simply deleting this file.
322 +#
323 +# See journald.conf(5) for details.
324 +
325 +
326 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
327 --- 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
328 +++ e-smith-base-5.8.1/root/etc/e-smith/templates/etc/systemd/journald.conf/05journal 2022-02-17 17:03:32.938000000 -0500
329 @@ -0,0 +1 @@
330 +[Journal]
331 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
332 --- 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
333 +++ e-smith-base-5.8.1/root/etc/e-smith/templates/etc/systemd/journald.conf/08dest 2022-02-17 17:03:33.153000000 -0500
334 @@ -0,0 +1 @@
335 +Storage=persistent
336 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
337 --- 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
338 +++ e-smith-base-5.8.1/root/etc/e-smith/templates/etc/systemd/journald.conf/09Compress 2022-02-17 17:03:33.420000000 -0500
339 @@ -0,0 +1 @@
340 +#Compress=yes
341 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
342 --- 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
343 +++ e-smith-base-5.8.1/root/etc/e-smith/templates/etc/systemd/journald.conf/10Seal 2022-02-17 17:03:33.649000000 -0500
344 @@ -0,0 +1 @@
345 +#Seal=yes
346 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
347 --- 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
348 +++ e-smith-base-5.8.1/root/etc/e-smith/templates/etc/systemd/journald.conf/11SplitMode 2022-02-17 17:03:33.880000000 -0500
349 @@ -0,0 +1 @@
350 +#SplitMode=uid
351 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
352 --- 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
353 +++ e-smith-base-5.8.1/root/etc/e-smith/templates/etc/systemd/journald.conf/20Rates 2022-02-17 17:03:34.104000000 -0500
354 @@ -0,0 +1,3 @@
355 +#SyncIntervalSec=5m
356 +#RateLimitInterval=30s
357 +#RateLimitBurst=1000
358 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
359 --- 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
360 +++ e-smith-base-5.8.1/root/etc/e-smith/templates/etc/systemd/journald.conf/30System 2022-02-17 17:03:34.776000000 -0500
361 @@ -0,0 +1,8 @@
362 +#SystemMaxUse= # default 10% and not more than 4G
363 +#SystemKeepFree= # default 15% and not more than 4G
364 +#SystemMaxFileSize= # default 1/8 SystemMaxUse
365 +#RuntimeMaxUse=
366 +#RuntimeKeepFree=
367 +#RuntimeMaxFileSize=
368 +MaxRetentionSec={$rsyslog{'PurgeLength'} || '95'}day
369 +MaxFileSec={$rsyslog{'RotateDays'} || '7'}day
370 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
371 --- 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
372 +++ e-smith-base-5.8.1/root/etc/e-smith/templates/etc/systemd/journald.conf/40Forward 2022-02-17 17:03:34.339000000 -0500
373 @@ -0,0 +1,5 @@
374 +ForwardToSyslog=no
375 +#ForwardToKMsg=no
376 +#ForwardToConsole=no
377 +#ForwardToWall=yes
378 +#TTYPath=/dev/console
379 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
380 --- 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
381 +++ e-smith-base-5.8.1/root/etc/e-smith/templates/etc/systemd/journald.conf/50MaxLevel 2022-02-17 17:03:34.549000000 -0500
382 @@ -0,0 +1,6 @@
383 +#MaxLevelStore=debug
384 +#MaxLevelSyslog=debug
385 +#MaxLevelKMsg=notice
386 +#MaxLevelConsole=info
387 +#MaxLevelWall=emerg
388 +#LineMax=48K
389 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
390 --- e-smith-base-5.8.1.old/root/sbin/e-smith/systemd/rsyslog-pre 1969-12-31 19:00:00.000000000 -0500
391 +++ e-smith-base-5.8.1/root/sbin/e-smith/systemd/rsyslog-pre 2022-02-13 00:01:02.364000000 -0500
392 @@ -0,0 +1,16 @@
393 +#!/bin/bash
394 +
395 +# before 10.1 rsyslog was listening to /dev/log
396 +# we want systemd-journald listen to that now
397 +# and rsyslog to /run/systemd/journal/syslog
398 +# will not be needed in SME 11
399 +
400 +if [[ ! -S /dev/log ]]; then
401 + #echo "no /dev/log"
402 + /usr/bin/systemctl restart systemd-journald.socket
403 + /usr/bin/systemctl restart systemd-journald.service
404 +fi
405 +
406 +# we can now keep going with rsyslog startup
407 +# /etc/rsyslog.conf will define the use of /run/systemd/journal/syslog
408 +
409 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
410 --- 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
411 +++ e-smith-base-5.8.1/root/usr/lib/systemd/system/rsyslog.service.d/51koozali.conf 2022-02-13 00:03:56.829000000 -0500
412 @@ -1,3 +1,8 @@
413 +[Service]
414 +ExecStartPre=-/sbin/e-smith/expand-template /etc/rsyslog.conf
415 +ExecStartPre=-/sbin/e-smith/systemd/rsyslog-pre
416 +ExecStartPost=-/sbin/e-smith/systemd/rsyslog-pre
417 +
418 [Install]
419 WantedBy=sme-server.target
420

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed