[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] Adapt ntp configuration for ntpsec (closes: #1038881)

[Mike Gabriel (@sunweaver)]

Mike Gabriel pushed to branch master at Debian Edu / debian-edu-config


Commits:
05a4ec8b by Guido Berhoerster at 2023-06-23T08:17:28+02:00
Adapt ntp configuration for ntpsec (closes: #1038881)

ntpsec has replaced ntp in bookworm, adapt configuration and add a drop-in file
instead of editing the configuration file.
Drop insserv overrides for ntp, the ntpsec systemd unit has an ordering
dependency on nss-lookup.target equivalent to the "$named" facility.

- - - - -


4 changed files:

- Makefile
- cf3/cf.ntp
- − etc/insserv/overrides/ntp
- + etc/ntpsec/ntp.d/debian-edu.conf


Changes:

=====================================
Makefile
=====================================
@@ -98,7 +98,6 @@ SYSCONFFILES = \
 	filesystems \
 	firefox-esr/debian-edu.js \
 	php/apache2/php-debian-edu.ini \
-	insserv/overrides/ntp \
 	ldap/rootDSE-debian-edu.ldif \
 	ldap/slapd-debian-edu-mdb.conf \
 	samba/smb-debian-edu.conf \
@@ -130,7 +129,8 @@ SYSCONFFILES = \
 	nagios3/debian-edu/service_templates.cfg \
 	nagios3/debian-edu/timeperiods.cfg \
 	munin/debian-edu-munin-node.conf \
-	polkit-1/localauthority.conf.d/80-edu-admin.conf
+	polkit-1/localauthority.conf.d/80-edu-admin.conf \
+	ntpsec/ntp.d/debian-edu.conf
 
 SYSCONFSCRIPTS = \
 	dhcp/dhclient-exit-hooks.d/autofs-reload \


=====================================
cf3/cf.ntp
=====================================
@@ -31,23 +31,3 @@ commands:
     "/usr/bin/apt-get install -y ntp"
       contain => in_shell;
 }
-
-bundle agent editline_ntp
-{
-
-vars:
-
-  "ntp_conf"   slist  => { "server 127.127.1.0 #local clock as fallback",
-                           "fudge 127.127.1.0 stratum 10 #not disciplined",};
-
-files:
-
-  # Add local clock on the main-server to ensure clients can sync with
-  # the main-server even when Internet connection is missing.
-
-  debian.server.installation::
-
-    "/etc/ntp.conf"
-      edit_line => append_if_no_line( @(ntp_conf) );
-}
-


=====================================
etc/insserv/overrides/ntp deleted
=====================================
@@ -1,10 +0,0 @@
-# BTS #585772
-### BEGIN INIT INFO
-# Provides:        ntp
-# Required-Start:  $network $remote_fs $syslog
-# Required-Stop:   $network $remote_fs $syslog
-# Should-Start:    $named
-# Default-Start:   2 3 4 5
-# Default-Stop:
-# Short-Description: Start NTP daemon
-### END INIT INFO


=====================================
etc/ntpsec/ntp.d/debian-edu.conf
=====================================
@@ -0,0 +1,2 @@
+server 127.127.1.0 #local clock as fallback
+refclock local stratum 10 #not disciplined



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/05a4ec8b419d1d83242026599d92d9f5b8fec368

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/05a4ec8b419d1d83242026599d92d9f5b8fec368
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20230623/d51c2d2b/attachment-0001.htm>