From 8bc58dd499ed544ad534814dcd1f7606796a7980 Mon Sep 17 00:00:00 2001 From: George Peppard Date: Sat, 3 Aug 2024 17:18:53 +0100 Subject: [PATCH 1/3] ntporg --- device-scripts/update-config.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/device-scripts/update-config.sh b/device-scripts/update-config.sh index 6c8cefd..ff6a4df 100755 --- a/device-scripts/update-config.sh +++ b/device-scripts/update-config.sh @@ -44,8 +44,8 @@ if [ "$ntp_server" == "public" ]; then ntp_server_addr=$public_compbox elif [ "$ntp_server" == "venue" ]; then ntp_server_addr=$compbox_ip -elif [ "$ntp_server" == "venue-fallback" ]; then - ntp_server_addr="$compbox_ip 0.pool.ntp.org 1.pool.ntp.org 2.pool.ntp.org 3.pool.ntp.org" +elif [ "$ntp_server" == "ntporg" ]; then + ntp_server_addr="0.pool.ntp.org 1.pool.ntp.org 2.pool.ntp.org 3.pool.ntp.org" fi sed 's/#FallbackNTP/FallbackNTP/' /etc/systemd/timesyncd.conf From b08eaba2edcaa5e7fbb066f0686a40b05022e3f7 Mon Sep 17 00:00:00 2001 From: George Peppard Date: Sat, 3 Aug 2024 23:03:23 +0100 Subject: [PATCH 2/3] Revert "ntporg" This reverts commit 8bc58dd499ed544ad534814dcd1f7606796a7980. --- device-scripts/update-config.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/device-scripts/update-config.sh b/device-scripts/update-config.sh index ff6a4df..6c8cefd 100755 --- a/device-scripts/update-config.sh +++ b/device-scripts/update-config.sh @@ -44,8 +44,8 @@ if [ "$ntp_server" == "public" ]; then ntp_server_addr=$public_compbox elif [ "$ntp_server" == "venue" ]; then ntp_server_addr=$compbox_ip -elif [ "$ntp_server" == "ntporg" ]; then - ntp_server_addr="0.pool.ntp.org 1.pool.ntp.org 2.pool.ntp.org 3.pool.ntp.org" +elif [ "$ntp_server" == "venue-fallback" ]; then + ntp_server_addr="$compbox_ip 0.pool.ntp.org 1.pool.ntp.org 2.pool.ntp.org 3.pool.ntp.org" fi sed 's/#FallbackNTP/FallbackNTP/' /etc/systemd/timesyncd.conf From ac84fd28361ea22a430092f6d3286c791b5d4f46 Mon Sep 17 00:00:00 2001 From: George Peppard Date: Sat, 3 Aug 2024 23:03:32 +0100 Subject: [PATCH 3/3] Revert "add NTP conf with a fallback" This reverts commit 4765473d60931f08cd8b99b4119f95eceed15389. --- device-scripts/update-config.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/device-scripts/update-config.sh b/device-scripts/update-config.sh index 6c8cefd..56eb7a9 100755 --- a/device-scripts/update-config.sh +++ b/device-scripts/update-config.sh @@ -44,12 +44,8 @@ if [ "$ntp_server" == "public" ]; then ntp_server_addr=$public_compbox elif [ "$ntp_server" == "venue" ]; then ntp_server_addr=$compbox_ip -elif [ "$ntp_server" == "venue-fallback" ]; then - ntp_server_addr="$compbox_ip 0.pool.ntp.org 1.pool.ntp.org 2.pool.ntp.org 3.pool.ntp.org" fi -sed 's/#FallbackNTP/FallbackNTP/' /etc/systemd/timesyncd.conf - current_ntp_server=$(awk '/^NTP=/{print $2}' /etc/systemd/timesyncd.conf) if [ -n "$ntp_server_addr" ] && [ "$current_ntp_server" != "$ntp_server_addr" ]; then sed -i "s/^#\?NTP=.*/NTP=$ntp_server_addr/" /etc/systemd/timesyncd.conf