smeserver/smeserver-ntp
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Tue Dec 17 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-7.sme

Browse Source 
- remove unused template [SME: 12525]
- fix action script [SME: 12590]
This commit is contained in:
Jean-Philippe Pialasse 2024-12-17 11:43:59 -05:00
parent a181d8a0e9
commit c8321c9cbe
3 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
createlinks
View File

@ -19,7 +19,7 @@ safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/ntpd");
# Configuration template expansion of ntp.conf # Configuration template expansion of ntp.conf
foreach my $file ( foreach my $file (
qw(/etc/ntp/step-tickers /etc/ntp.conf /usr/lib//systemd/system/ntpd.service.d/50koozali.conf)) qw(/etc/ntp.conf /usr/lib//systemd/system/ntpd.service.d/50koozali.conf))
{ {
templates2events($file, qw( templates2events($file, qw(
timeserver-update timeserver-update

19
root/etc/e-smith/events/actions/conf-timezone
View File

@ -37,20 +37,8 @@ if (defined $timezone)
} }
else else
{ {
# Initialise timezone from /etc/sysconfig/clock if not already set # Initialise timezone from timectl if not already set
if (open(CLOCK, "/etc/sysconfig/clock")) $timezone=`timedatectl 2>/dev/null | grep "zone" | sed -e 's/^[ ]*Time zone: \(.*\) (.*)$/\1/g'`;
{
while(<CLOCK>)
{
$timezone = $1 if /^ZONE="(.*)"/;
last if defined $timezone;
}
close(CLOCK) or warn("Could not close CLOCK: $!");
}
else
{
warn("Could not open /etc/sysconfig/clock: $!");
}
# If all else fails ... # If all else fails ...
$timezone = "US/Eastern" unless defined $timezone; $timezone = "US/Eastern" unless defined $timezone;
$db->new_record('TimeZone')->set_value($timezone); $db->new_record('TimeZone')->set_value($timezone);
@ -60,7 +48,4 @@ else
unlink "/etc/localtime"; unlink "/etc/localtime";
symlink "../usr/share/zoneinfo/$timezone", "/etc/localtime"; symlink "../usr/share/zoneinfo/$timezone", "/etc/localtime";
# Process the template for /etc/sysconfig/clock
processTemplate ({TEMPLATE_PATH => "/etc/sysconfig/clock"});
exit (0); exit (0);

6
smeserver-ntp.spec
View File

@ -4,7 +4,7 @@ Summary: smeserver specific NTP configuration files and templates
%define name smeserver-ntp %define name smeserver-ntp
Name: %{name} Name: %{name}
%define version 11.0.0 %define version 11.0.0
%define release 6 %define release 7
Version: %{version} Version: %{version}
Release: %{release}%{?dist} Release: %{release}%{?dist}
License: GPL License: GPL
@ -21,6 +21,10 @@ Requires: smeserver-lib >= 1.15.1-19
AutoReqProv: no AutoReqProv: no
%changelog %changelog
* Tue Dec 17 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-7.sme
- remove unused template [SME: 12525]
- fix action script [SME: 12590]
* Wed Apr 17 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-6.sme * Wed Apr 17 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-6.sme
- update package for ntpsec [SME: 12590] - update package for ntpsec [SME: 12590]