/[smeserver]/rpms/e-smith-base/sme9/e-smith-base-5.4.0-more_rsyslog.patch
ViewVC logotype

Contents of /rpms/e-smith-base/sme9/e-smith-base-5.4.0-more_rsyslog.patch

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


Revision 1.1 - (show annotations) (download)
Sat Mar 16 16:15:40 2013 UTC (11 years, 7 months ago) by slords
Branch: MAIN
CVS Tags: e-smith-base-5_4_0-33_el6_sme, e-smith-base-5_4_0-40_el6_sme, e-smith-base-5_4_0-44_el6_sme, e-smith-base-5_4_0-49_el6_sme, e-smith-base-5_4_0-23_el6_sme, e-smith-base-5_4_0-37_el6_sme, e-smith-base-5_4_0-42_el6_sme, e-smith-base-5_4_0-27_el6_sme, e-smith-base-5_4_0-24_el6_sme, e-smith-base-5_4_0-43_el6_sme, e-smith-base-5_4_0-34_el6_sme, e-smith-base-5_4_0-35_el6_sme, e-smith-base-5_4_0-36_el6_sme, e-smith-base-5_4_0-41_el6_sme, e-smith-base-5_4_0-30_el6_sme, e-smith-base-5_4_0-50_el6_sme, e-smith-base-5_4_0-29_el6_sme, e-smith-base-5_4_0-26_el6_sme, e-smith-base-5_4_0-58_el6_sme, e-smith-base-5_4_0-45_el6_sme, e-smith-base-5_4_0-57_el6_sme, e-smith-base-5_4_0-46_el6_sme, e-smith-base-5_4_0-62_el6_sme, e-smith-base-5_4_0-32_el6_sme, e-smith-base-5_4_0-39_el6_sme, e-smith-base-5_4_0-56_el6_sme, e-smith-base-5_4_0-52_el6_sme, e-smith-base-5_4_0-54_el6_sme, e-smith-base-5_4_0-51_el6_sme, e-smith-base-5_4_0-47_el6_sme, e-smith-base-5_4_0-55_el6_sme, e-smith-base-5_4_0-31_el6_sme, e-smith-base-5_4_0-38_el6_sme, e-smith-base-5_4_0-25_el6_sme, e-smith-base-5_4_0-28_el6_sme, e-smith-base-5_4_0-53_el6_sme, e-smith-base-5_4_0-61_el6_sme, e-smith-base-5_4_0-60_el6_sme, e-smith-base-5_4_0-48_el6_sme, e-smith-base-5_4_0-59_el6_sme
* Sat Mar 16 2013 Shad L. Lords <slords@mail.com> 5.4.0-23.sme
- Fix a few more syslog => rsyslog items [SME: 7221]

1 diff -ruN e-smith-base-5.4.0.rsyslog/root/etc/e-smith/events/actions/copy-anaconda-logs e-smith-base-5.4.0/root/etc/e-smith/events/actions/copy-anaconda-logs
2 --- e-smith-base-5.4.0.rsyslog/root/etc/e-smith/events/actions/copy-anaconda-logs 2007-01-19 14:33:20.000000000 -0700
3 +++ e-smith-base-5.4.0/root/etc/e-smith/events/actions/copy-anaconda-logs 2013-03-16 10:11:33.106970436 -0600
4 @@ -19,10 +19,17 @@
5
6 NOW=$(date +%Y%m%d%H%M%S)
7 LIST='
8 + /root/install.log
9 + /root/install.log.syslog
10 /root/upgrade.log
11 /root/upgrade.log.syslog
12 + /var/log/anaconda.ifcfg.log
13 /var/log/anaconda.log
14 - /var/log/anaconda.syslog'
15 + /var/log/anaconda.ifcfg.log
16 + /var/log/anaconda.program.log
17 + /var/log/anaconda.storage.log
18 + /var/log/anaconda.syslog
19 + /var/log/anaconda.yum.log'
20
21 for i in $LIST
22 do
23 diff -ruN e-smith-base-5.4.0.rsyslog/root/etc/e-smith/events/actions/purge-old-logs e-smith-base-5.4.0/root/etc/e-smith/events/actions/purge-old-logs
24 --- e-smith-base-5.4.0.rsyslog/root/etc/e-smith/events/actions/purge-old-logs 2007-01-19 14:33:22.000000000 -0700
25 +++ e-smith-base-5.4.0/root/etc/e-smith/events/actions/purge-old-logs 2013-03-16 10:09:18.822606835 -0600
26 @@ -28,15 +28,15 @@
27
28 my $cdb = esmith::ConfigDB->open_ro;
29
30 -my $syslog = $cdb->get('syslog') or die "No syslog db entry found";
31 -my $length = $syslog->prop('PurgeLength') || '95';
32 +my $rsyslog = $cdb->get('rsyslog') or die "No rsyslog db entry found";
33 +my $length = $rsyslog->prop('PurgeLength') || '95';
34
35 $ENV{'PATH'} = "/bin";
36
37 #----------------------------------------------------------------------
38 # Find all files in /var/log/ that are:
39 # - real files
40 -# - older than syslog{PurgeLength}, or 95 days if unset
41 +# - older than rsyslog{PurgeLength}, or 95 days if unset
42 # - matches our log naming scheme
43 # and eliminate them.
44 #----------------------------------------------------------------------
45 diff -ruN e-smith-base-5.4.0.rsyslog/root/etc/e-smith/events/actions/rotate_timestamped_logfiles e-smith-base-5.4.0/root/etc/e-smith/events/actions/rotate_timestamped_logfiles
46 --- e-smith-base-5.4.0.rsyslog/root/etc/e-smith/events/actions/rotate_timestamped_logfiles 2008-03-26 10:48:59.000000000 -0600
47 +++ e-smith-base-5.4.0/root/etc/e-smith/events/actions/rotate_timestamped_logfiles 2013-03-16 10:09:21.682614532 -0600
48 @@ -48,7 +48,7 @@
49 s/^\.//;
50 my $filename = $_;
51
52 - # Set up filenames to be used by syslog. We first set up symlinks
53 + # Set up filenames to be used by rsyslog. We first set up symlinks
54 # with known names, then use the value of the symlink when we
55 # expand the configuration files
56 my $time = time();
57 diff -ruN e-smith-base-5.4.0.rsyslog/root/etc/e-smith/tests/10e-smith-base/configuration.conf e-smith-base-5.4.0/root/etc/e-smith/tests/10e-smith-base/configuration.conf
58 --- e-smith-base-5.4.0.rsyslog/root/etc/e-smith/tests/10e-smith-base/configuration.conf 2005-11-20 21:28:10.000000000 -0700
59 +++ e-smith-base-5.4.0/root/etc/e-smith/tests/10e-smith-base/configuration.conf 2013-03-16 10:11:54.260028102 -0600
60 @@ -96,6 +96,6 @@
61 squid=service|InitscriptOrder|90|status|enabled
62 sshd=service|InitscriptOrder|85|PasswordAuthentication|yes|PermitRootLogin|yes|access|private|status|enabled
63 sync=service|Host|service.e-smith.com|LastId|0|SuccessId|0|SyncFrequency|1|SyncMinute|57|status|disabled
64 -syslog=service|InitscriptOrder|05|status|enabled
65 +rsyslog=service|InitscriptOrder|05|status|enabled
66 telnet=service|access|private|status|disabled
67 wibble=42
68 diff -ruN e-smith-base-5.4.0.rsyslog/root/etc/rc.d/init.d/bootstrap-console e-smith-base-5.4.0/root/etc/rc.d/init.d/bootstrap-console
69 --- e-smith-base-5.4.0.rsyslog/root/etc/rc.d/init.d/bootstrap-console 2007-01-26 18:56:31.000000000 -0700
70 +++ e-smith-base-5.4.0/root/etc/rc.d/init.d/bootstrap-console 2013-03-16 10:12:26.702116063 -0600
71 @@ -42,10 +42,10 @@
72 yes) /sbin/e-smith/bootstrap-console console
73 ;;
74
75 - no) # And now we'd better restart syslog which
76 + no) # And now we'd better restart rsyslog which
77 # may have been configured before the changes in the
78 # console
79 - /etc/rc.d/init.d/syslog restart
80 + /etc/rc.d/init.d/rsyslog restart
81 break
82 ;;
83 esac
84 diff -ruN e-smith-base-5.4.0.rsyslog/root/var/service/syslog/run e-smith-base-5.4.0/root/var/service/syslog/run
85 --- e-smith-base-5.4.0.rsyslog/root/var/service/syslog/run 2005-11-20 21:28:11.000000000 -0700
86 +++ e-smith-base-5.4.0/root/var/service/syslog/run 2013-03-16 10:13:29.371288605 -0600
87 @@ -1,3 +1,3 @@
88 #! /bin/sh
89
90 -exec /sbin/syslogd -m 0 -n
91 +exec /sbin/rsyslogd -i /var/run/syslogd.pid -c 5

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