From 5d98a03700189a20f707fd9dbb155adc7ddd7e24 Mon Sep 17 00:00:00 2001 From: Angelo Naselli Date: Fri, 27 Mar 2015 16:02:24 +0100 Subject: Fixed NTP server configuration and access from /etc/systemd/timesyncd.conf --- Changes | 2 ++ lib/ManaTools/Shared/TimeZone.pm | 11 ++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Changes b/Changes index 18b9721c..4e940791 100644 --- a/Changes +++ b/Changes @@ -1,4 +1,6 @@ 1.0.1 27/03/2015 07:07 + - manaclock: fixed NTP server configuration and access + into /etc/systemd/timesyncd.conf - manaclock: actions are performed only on changes, also to avoid asking password when not needed in user space - manaclock: if no NTP is installed rise a warning in case of diff --git a/lib/ManaTools/Shared/TimeZone.pm b/lib/ManaTools/Shared/TimeZone.pm index e6b843fd..936515bb 100644 --- a/lib/ManaTools/Shared/TimeZone.pm +++ b/lib/ManaTools/Shared/TimeZone.pm @@ -848,7 +848,12 @@ sub ntpCurrentServer { my $configFile = $self->ntp_configuration_file || $self->getNTPServiceConfig($self->ntp_program); - MDK::Common::Func::find { $_ ne '127.127.1.0' } map { MDK::Common::Func::if_(/^\s*server\s+(\S*)/, $1) } MDK::Common::File::cat_($configFile); + if ($self->ntp_program eq "systemd-timesyncd") { + return MDK::Common::Func::find { $_ ne '127.127.1.0' } map { MDK::Common::Func::if_(/^\s*NTP=\s*(\S*)\s*(\S*)/, $1) } MDK::Common::File::cat_($configFile); + } + else { + return MDK::Common::Func::find { $_ ne '127.127.1.0' } map { MDK::Common::Func::if_(/^\s*server\s+(\S*)/, $1) } MDK::Common::File::cat_($configFile); + } } #============================================================= @@ -936,8 +941,8 @@ sub setNTPConfiguration { if ($self->ntp_program eq "systemd-timesyncd") { my $added = 0; MDK::Common::File::substInFile { - if (/^#?\s*NTP=\s+(\S*)/ && $1 ne '127.127.1.0') { - $_ = $added ? $_ =~ $pool_match ? undef : "#NTP=$1\n" : join('NTP= ', @servers, "\n"); + if (/^#?\s*NTP=\s*(\S*)/ && $1 ne '127.127.1.0') { + $_ = $added ? $_ =~ $pool_match ? undef : "#NTP=$1\n" : join(' ', 'NTP=', @servers, "\n"); $added = 1; } } $f; -- cgit v1.2.1 From 373e49badf96d3650f60c7f87b453a894edc966b Mon Sep 17 00:00:00 2001 From: Angelo Naselli Date: Fri, 27 Mar 2015 16:17:22 +0100 Subject: Updated --- Changes | 1 + 1 file changed, 1 insertion(+) diff --git a/Changes b/Changes index 4e940791..6f5dc363 100644 --- a/Changes +++ b/Changes @@ -1,6 +1,7 @@ 1.0.1 27/03/2015 07:07 - manaclock: fixed NTP server configuration and access into /etc/systemd/timesyncd.conf + - manawall: fixed samba/cifs ports for samba-server entry - manaclock: actions are performed only on changes, also to avoid asking password when not needed in user space - manaclock: if no NTP is installed rise a warning in case of -- cgit v1.2.1