[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] Use the etc/ldap directory for the dedicated slapd.conf file

[Wolfgang Schweer (@schweer-guest)]

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


Commits:
ff5595c2 by Wolfgang Schweer at 2021-10-03T11:08:10+02:00
Use the etc/ldap directory for the dedicated slapd.conf file

Instead of using cf-agent to copy the file, this makes the setup more robust.

  Remove share/debian-edu-config/slapd-debian-edu-mdb.conf.
  Add etc/ldap/slapd-debian-edu-mdb.conf.
  Adjust share/debian-edu-config/tools/move-ldap-bdb-to-mdb, Makefile and
  cf3/cf.ldapserver accordingly.

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -


5 changed files:

- Makefile
- cf3/cf.ldapserver
- debian/changelog
- share/debian-edu-config/slapd-debian-edu-mdb.conf → etc/ldap/slapd-debian-edu-mdb.conf
- share/debian-edu-config/tools/move-ldap-bdb-to-mdb


Changes:

=====================================
Makefile
=====================================
@@ -104,6 +104,7 @@ SYSCONFFILES = \
 	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 \
 	slbackup-php/config.php \
 	smbldap-tools/smbldap_bind.conf \
@@ -343,7 +344,6 @@ install: install-testsuite
 		share/debian-edu-config/isc-dhcp-server.service \
 		share/debian-edu-config/isc-dhcp-server.service.eth1_only \
 		share/debian-edu-config/killer.cron \
-		share/debian-edu-config/slapd-debian-edu-mdb.conf \
 		share/pam-configs/edu-group \
 		share/pam-configs/edu-umask \
 		share/perl5/Debian/Edu.pm \


=====================================
cf3/cf.ldapserver
=====================================
@@ -8,8 +8,6 @@ files:
 
   debian.server.installation::
 
-    "etc/ldap/slapd-debian-edu-mdb.conf"
-      copy_from => local_cp("/usr/share/debian-edu-config/slapd-debian-edu-mdb.conf");
     "/etc/ldap/slapd.conf"
     link_from => ln_s("/etc/ldap/slapd-debian-edu-mdb.conf"),
     move_obstructions => "true";


=====================================
debian/changelog
=====================================
@@ -1,8 +1,17 @@
 debian-edu-config (2.12.5) UNRELEASED; urgency=medium
 
+  [ Mike Gabriel ]
   * share/debian-edu-config/tools/: Fix TFTP server path (/var/lib/tftpboot
     -> /srv/tftp).
 
+  [ Wolfgang Schweer ]
+  * Use the etc/ldap directory for the dedicated slapd.conf file instead of
+    using cf-agent to copy the file; this makes the setup more robust:
+    - Remove share/debian-edu-config/slapd-debian-edu-mdb.conf.
+    - Add etc/ldap/slapd-debian-edu-mdb.conf.
+    - Adjust share/debian-edu-config/tools/move-ldap-bdb-to-mdb, Makefile and
+      cf3/cf.ldapserver accordingly.
+
  -- Mike Gabriel <sunweaver at debian.org>  Sun, 03 Oct 2021 10:13:28 +0200
 
 debian-edu-config (2.12.4) unstable; urgency=medium


=====================================
share/debian-edu-config/slapd-debian-edu-mdb.conf → etc/ldap/slapd-debian-edu-mdb.conf
=====================================


=====================================
share/debian-edu-config/tools/move-ldap-bdb-to-mdb
=====================================
@@ -7,7 +7,6 @@ if [ ! -f /var/lib/ldap/data.mdb ] ; then
 	slapcat > $TMPDIR/all.ldif
 	service slapd stop
 	rm /var/lib/ldap/*
-	cp /usr/share/debian-edu-config/slapd-debian-edu-mdb.conf /etc/ldap
 	ln -sf /etc/ldap/slapd-debian-edu-mdb.conf /etc/ldap/slapd.conf
 	service slapd start
 	slapadd -l $TMPDIR/all.ldif



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

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/ff5595c28e84b87171e1eb3d239c8b10fe63772d
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/20211003/242f7eef/attachment-0001.htm>