[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] 2 commits: Adjust share/debian-edu-config/isc-dhcp-server.service.eth1_only

[Wolfgang Schweer (@schweer-guest)]

Wolfgang Schweer pushed to branch master at Debian Edu / debian-edu-config


Commits:
7d7d8693 by Wolfgang Schweer at 2022-10-07T23:55:40+02:00
Adjust share/debian-edu-config/isc-dhcp-server.service.eth1_only

 Use nslcd instead of slapd as required service. Otherwise the DHCP service on a
 separate or additional LTSP server fails to start if it has been stopped before.

- - - - -
2c994183 by Wolfgang Schweer at 2022-10-08T00:11:27+02:00
Adjust ldap-tools/ldap-debian-edu-install

 After the move to MDB the slapd package recently stopped shipping the BDB
 related DB_CONFIG example file. Trying to copy the file breaks LDAP setup.

- - - - -


3 changed files:

- debian/changelog
- ldap-tools/ldap-debian-edu-install
- share/debian-edu-config/isc-dhcp-server.service.eth1_only


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+debian-edu-config (2.12.23) UNRELEASED; urgency=medium
+
+  * share/debian-edu-config/isc-dhcp-server.service.eth1_only: Use nslcd instead
+    of slapd as required service. Otherwise the DHCP service on a separate or
+    additional LTSP server fails to start if it has been stopped before.
+  * ldap-tools/ldap-debian-edu-install: After the move to MDB the slapd package
+    recently stopped shipping the BDB related DB_CONFIG example file. Trying to
+    copy the file breaks LDAP setup.
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Fri, 07 Oct 2022 23:47:21 +0200
+
 debian-edu-config (2.12.22) unstable; urgency=medium
 
   * d/postinst: do not call update-mime anymore. Closes: #1010432.


=====================================
ldap-tools/ldap-debian-edu-install
=====================================
@@ -110,20 +110,6 @@ fi
 
 ################# password available now ##################
 
-copy_example_DB_CONFIG() {
-#function to set a DB_CONFIG, ripped from slapd.postinst
-# Copy an example DB_CONFIG file
-# copy_example_DB_CONFIG <directory>
-        local directory srcdir
-
-        directory="$1"
-        srcdir="/usr/share/doc/slapd/examples"
-
-        if ! [ -f "${directory}/DB_CONFIG" ] && [ -d "$directory" ]; then
-                cp $srcdir/DB_CONFIG "${directory}/DB_CONFIG"
-        fi
-}
-
 lookup_mac_addrs() {
     PATH=/sbin:$PATH LANG=C ifconfig 2>/dev/null | grep -i hwaddr | awk '{print $5}' | sort -u
 }
@@ -198,7 +184,6 @@ dns_stop() {
 init_ldap () {
 
   rm -f /var/lib/ldap/*
-  copy_example_DB_CONFIG /var/lib/ldap
 
   if [ -f /etc/shadow ] ; then
       FILE=/etc/shadow


=====================================
share/debian-edu-config/isc-dhcp-server.service.eth1_only
=====================================
@@ -1,7 +1,7 @@
 [Unit]
 Description=DHCP server
 After=network.target network-online.target
-Requires=slapd.service
+Requires=nslcd.service
 
 [Service]
 Type=forking



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/cee2fe8cda92aff0d6b42f7ffcdda8e6291f3f7b...2c994183fc257ff24e267fc63b980c3fe83880f3

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/cee2fe8cda92aff0d6b42f7ffcdda8e6291f3f7b...2c994183fc257ff24e267fc63b980c3fe83880f3
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/20221007/c8063210/attachment-0001.htm>