packages/rsyslog
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update timezone

Browse Source
This commit is contained in:
19909236985 2022-02-11 15:35:45 +08:00
parent 163c3fd5e9
commit 1505957cbf
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
os_check_timezone_for_rsyslog.sh
View File

@ -1,5 +1,6 @@
#!/bin/bash #!/bin/bash
umask 0077
LOCK_FILE=/var/lock/os_check_timezone_change.lock LOCK_FILE=/var/lock/os_check_timezone_change.lock
exec 200<>$LOCK_FILE exec 200<>$LOCK_FILE
flock -nx 200 flock -nx 200

1
rsyslog.service
View File

@ -10,6 +10,7 @@ Documentation=https://www.rsyslog.com/doc/
Type=notify Type=notify
EnvironmentFile=-/etc/sysconfig/rsyslog EnvironmentFile=-/etc/sysconfig/rsyslog
ExecStart=/usr/sbin/rsyslogd -n -i/var/run/rsyslogd.pid $SYSLOGD_OPTIONS ExecStart=/usr/sbin/rsyslogd -n -i/var/run/rsyslogd.pid $SYSLOGD_OPTIONS
ExecStartPost=/bin/bash /usr/bin/timezone_update.sh
UMask=0066 UMask=0066
StandardOutput=null StandardOutput=null
Restart=on-failure Restart=on-failure

10
rsyslog.spec
View File

@ -4,7 +4,7 @@
Name: rsyslog Name: rsyslog
Version: 8.2110.0 Version: 8.2110.0
Release: 2 Release: 3
Summary: The rocket-fast system for log processing Summary: The rocket-fast system for log processing
License: (GPLv3+ and ASL 2.0) License: (GPLv3+ and ASL 2.0)
URL: http://www.rsyslog.com/ URL: http://www.rsyslog.com/
@ -17,6 +17,7 @@ Source5: os_rotate_and_save_log.sh
Source6: os_check_timezone_for_rsyslog.sh Source6: os_check_timezone_for_rsyslog.sh
Source7: timezone.cron Source7: timezone.cron
Source8: rsyslog.service Source8: rsyslog.service
Source9: timezone_update.sh
Patch9000: rsyslog-8.24.0-ensure-parent-dir-exists-when-writting-log-file.patch Patch9000: rsyslog-8.24.0-ensure-parent-dir-exists-when-writting-log-file.patch
Patch9001: bugfix-rsyslog-7.4.7-imjournal-add-monotonic-timestamp.patch Patch9001: bugfix-rsyslog-7.4.7-imjournal-add-monotonic-timestamp.patch
@ -322,6 +323,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/cron.d/
install -m 0600 %{_sourcedir}/timezone.cron $RPM_BUILD_ROOT/etc/cron.d/ install -m 0600 %{_sourcedir}/timezone.cron $RPM_BUILD_ROOT/etc/cron.d/
install -m 0500 %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/os_rotate_and_save_log.sh install -m 0500 %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/os_rotate_and_save_log.sh
install -m 0500 %{SOURCE6} $RPM_BUILD_ROOT%{_bindir}/os_check_timezone_for_rsyslog.sh install -m 0500 %{SOURCE6} $RPM_BUILD_ROOT%{_bindir}/os_check_timezone_for_rsyslog.sh
install -m 0500 %{SOURCE8} $RPM_BUILD_ROOT%{_bindir}/timezone_update.sh
cp -r doc/* $RPM_BUILD_ROOT%{rsyslog_docdir}/html cp -r doc/* $RPM_BUILD_ROOT%{rsyslog_docdir}/html
@ -357,6 +359,7 @@ done
%{_sbindir}/rsyslogd %{_sbindir}/rsyslogd
%attr(500,root,root) %{_bindir}/os_rotate_and_save_log.sh %attr(500,root,root) %{_bindir}/os_rotate_and_save_log.sh
%attr(500,root,root) %{_bindir}/os_check_timezone_for_rsyslog.sh %attr(500,root,root) %{_bindir}/os_check_timezone_for_rsyslog.sh
%attr(500,root,root) %{_bindir}/timezone_update.sh
/etc/cron.d/timezone.cron /etc/cron.d/timezone.cron
%{_unitdir}/rsyslog.service %{_unitdir}/rsyslog.service
%config(noreplace) %{_sysconfdir}/rsyslog.conf %config(noreplace) %{_sysconfdir}/rsyslog.conf
@ -472,7 +475,10 @@ done
%{_mandir}/man1/rscryutil.1.gz %{_mandir}/man1/rscryutil.1.gz
%changelog %changelog
* Tue Dec 2021 wuchaochao <wuchaochao4@huawei.com> - 8.2110.0-2 * Fri Feb 11 2022 wuchaochao <cyanrose@yeah.net> - 8.2110.0-3
- update timezone when restart rsyslog
* Tue Dec 14 2021 wuchaochao <wuchaochao4@huawei.com> - 8.2110.0-2
- move rsyslog-crypto rsyslog-doc rsyslog-elasticsearch rsyslog-mmjsonparse syslog-mmaudit rsyslog-mmsnmptrapd rsyslog-mysql syslog-gssapi rsyslog-gnutls rsyslog-updspoof from rsyslog - move rsyslog-crypto rsyslog-doc rsyslog-elasticsearch rsyslog-mmjsonparse syslog-mmaudit rsyslog-mmsnmptrapd rsyslog-mysql syslog-gssapi rsyslog-gnutls rsyslog-updspoof from rsyslog
* Thu Dec 09 2021 wuchaochao <wuchaochao4@huawei.com> - 8.2110.0-1 * Thu Dec 09 2021 wuchaochao <wuchaochao4@huawei.com> - 8.2110.0-1

4
timezone_update.sh Normal file
View File

@ -0,0 +1,4 @@
#!/bin/bash
umask 0066
/usr/bin/date +%Z%z > /etc/localtime_tmp