[debian-edu-commits] debian-edu/ 11/12: Adjust d/debian-edu-config.(postinst|postrm|lintian-overrides) and Makefile.

[Wolfgang Schweer]

This is an automated email from the git hooks/post-receive script.

schweer-guest pushed a commit to branch master
in repository debian-edu-config.

commit 503f4970432a7bc4557b13bdd7e88144086a70b6
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Fri Feb 9 15:45:08 2018 +0100

    Adjust d/debian-edu-config.(postinst|postrm|lintian-overrides) and Makefile.
---
 Makefile                                   | 11 +++++++----
 debian/debian-edu-config.lintian-overrides |  2 +-
 debian/debian-edu-config.postinst          |  5 +++++
 debian/debian-edu-config.postrm            | 10 ++++++++++
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 3f75e42..0de4e71 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,6 @@ bindir     = $(prefix)/bin
 sbindir    = $(prefix)/sbin
 docdir     = $(prefix)/share/doc/$(PACKAGE)
 mandir     = $(prefix)/share/man
-gosadir    = $(sysconfdir)/gosa
 ldapdir    = $(sysconfdir)/ldap
 slbackupphpdir = $(sysconfdir)/slbackup-php
 schemadir  = $(ldapdir)/schema
@@ -50,6 +49,7 @@ CF3FILES = \
 	cf.krb5client \
 	cf.ldapserver \
 	cf.ldapclient \
+	cf.ldapscripts \
 	cf.bind \
 	cf.pxeinstall \
 	cf.ntp \
@@ -94,7 +94,6 @@ SYSCONFFILES = \
 	exim4/exim-ldap-server-v4.conf \
 	filesystems \
 	firefox-esr/debian-edu.js \
-	gosa/gosa.conf \
 	php/apache2/php-debian-edu.ini \
 	insserv/overrides/ntp \
 	ldap/rootDSE-debian-edu.ldif \
@@ -173,8 +172,7 @@ SYSCONFSCRIPTS = \
 	resolvconf/update.d/ltsp-chroots \
 	wicd/scripts/preconnect/set_wireless_mac_from_eth0 \
 	X11/Xsession-debian-edu \
-	samba/smbaddclient.sh \
-	samba/smbldap-machineadd-gosa
+	samba/smbaddclient.sh
 
 SCHEMAS = \
 	samba.schema \
@@ -377,6 +375,7 @@ install: install-testsuite
 		share/debian-edu-config/tools/wpad-extract \
 		share/debian-edu-config/tools/ldap-server-getcert \
 		share/debian-edu-config/tools/exim4-create-environment \
+		share/debian-edu-config/tools/edu-ldap-from-scratch \
 		share/debian-edu-config/ltspfs-mounter-kde \
 		share/ltsp/get-ldap-ltsp-config \
 		share/initramfs-tools/scripts/nfs-bottom/before-ltsp \
@@ -435,6 +434,10 @@ install: install-testsuite
 		share/debian-edu-config/v3.cnf \
 		share/debian-edu-config/v3CA.cnf \
 		share/debian-edu-config/profiles.ini \
+		share/debian-edu-config/debian-edu.addmachine.template \
+		share/debian-edu-config/debian-edu.ldapscripts.passwd \
+		share/debian-edu-config/passwords_stub.dat \
+		share/debian-edu-config/gosa.conf.template \
 		share/pam-configs/edu-group \
 		share/pam-configs/edu-umask \
 		share/perl5/Debian/Edu.pm \
diff --git a/debian/debian-edu-config.lintian-overrides b/debian/debian-edu-config.lintian-overrides
index eab60b6..204c9c7 100644
--- a/debian/debian-edu-config.lintian-overrides
+++ b/debian/debian-edu-config.lintian-overrides
@@ -3,7 +3,7 @@ debian-edu-config binary: script-not-executable etc/dhcp/dhclient-exit-hooks.d/f
 debian-edu-config binary: script-not-executable etc/dhcp/dhclient-exit-hooks.d/hostname
 debian-edu-config binary: script-not-executable etc/dhcp/dhclient-exit-hooks.d/wpad-proxy-update
 debian-edu-config binary: command-with-path-in-maintainer-script postinst:51 /usr/bin/etckeeper
-debian-edu-config binary: command-with-path-in-maintainer-script postinst:282 /usr/bin/etckeeper
+debian-edu-config binary: command-with-path-in-maintainer-script postinst:287 /usr/bin/etckeeper
 debian-edu-config binary: non-standard-apache2-configuration-name debian-edu-config-doc.conf != debian-edu-config.conf
 debian-edu-config binary: debconf-is-not-a-registry usr/bin/ldap-debian-edu-install
 debian-edu-config binary: debconf-is-not-a-registry usr/share/debian-edu-config/d-i/finish-install
diff --git a/debian/debian-edu-config.postinst b/debian/debian-edu-config.postinst
index 5da243b..c794597 100644
--- a/debian/debian-edu-config.postinst
+++ b/debian/debian-edu-config.postinst
@@ -197,6 +197,11 @@ configure)
 	rm /usr/share/man/man1/.1.gz
     fi
 
+    if dpkg --compare-versions "$2" le "2.10.21" && \
+        [ -f /etc/samba/smbldap-machineadd-gosa ] ; then
+	rm /etc/samba/smbldap-machineadd-gosa
+    fi
+
     # sssd refuses to read the file if it has any other mode
     chmod 600 /etc/sssd/sssd-debian-edu.conf
     chown root:root /etc/sssd/sssd-debian-edu.conf
diff --git a/debian/debian-edu-config.postrm b/debian/debian-edu-config.postrm
index cd099d7..65c1b41 100644
--- a/debian/debian-edu-config.postrm
+++ b/debian/debian-edu-config.postrm
@@ -43,6 +43,16 @@ case "$1" in
 	    rm /var/log/cfengine3/*.log
 	fi
 
+        # Don't leave copied ldapscripts files behind
+	if [ -e /etc/ldapscripts/debian-edu.addmachine.template ] ; then
+	    rm /etc/ldapscripts/debian-edu.*
+	fi
+
+        # Don't leave copied gosa file behind
+	if [ -e /etc/gosa/gosa.conf ] ; then
+	    rm /etc/gosa/gosa.conf
+	fi
+
 	# remove /var/lib/dovecot directory (this does not
 	# interfere with dovecot-core, if installed)
 	if [ -e /var/lib/dovecot ] ; then

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git