[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] 5 commits: Drop share/debian-edu-config/tools/password-fix-squeeze-r0.
Holger Levsen
gitlab at salsa.debian.org
Tue Oct 8 12:46:29 BST 2019
Holger Levsen pushed to branch master at Debian Edu / debian-edu-config
Commits:
b338dc6d by Holger Levsen at 2019-10-08T11:25:47Z
Drop share/debian-edu-config/tools/password-fix-squeeze-r0.
Skipping upgrades is not supported.
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
a922f9b5 by Holger Levsen at 2019-10-08T11:31:55Z
rewrite comment to not cause confusion when looking for cruft
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
57c755df by Holger Levsen at 2019-10-08T11:37:12Z
rewrite another comment to not cause confusion when looking for cruft, or should we drop this script completly?
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
c82ef720 by Holger Levsen at 2019-10-08T11:38:55Z
Drop stuff commented out in 2012 in ldap-bootstrap/root.ldif.
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
97f4f635 by Holger Levsen at 2019-10-08T11:46:04Z
Drop debian/debian-edu-config.preinst obsolete since buster development had begun.
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
6 changed files:
- Makefile
- debian/changelog
- − debian/debian-edu-config.preinst
- ldap-bootstrap/root.ldif
- ldap-tools/ldap-debian-edu-install
- − share/debian-edu-config/tools/password-fix-squeeze-r0
Changes:
=====================================
Makefile
=====================================
@@ -318,7 +318,6 @@ install: install-testsuite
share/debian-edu-config/tools/nightkill.sh \
share/debian-edu-config/tools/notify-local-users \
share/debian-edu-config/tools/package-disk-usage \
- share/debian-edu-config/tools/password-fix-squeeze-r0 \
share/debian-edu-config/tools/pipegraph \
share/debian-edu-config/tools/preseed-ldap-kerberos \
share/debian-edu-config/tools/preseed-sitesummary \
=====================================
debian/changelog
=====================================
@@ -10,10 +10,15 @@ debian-edu-config (2.11.4) UNRELEASED; urgency=medium
references to EDUSUITE which were forgotten in a code cleanup in
commit c6ef9d69 in 2016.
* README: update reference to point to bullseye, not buster.
- * cf3/cf.squid: drop workaround for stretch -> buster upgrades as skipping a
- release when upgrading is not supported.
* cf.workarounds: drop workaround for #922718 as the fixed xfce4-session
package has made it into bullseye.
+ * cf3/cf.squid: drop workaround for stretch -> buster upgrades as skipping a
+ release when upgrading is not supported.
+ * Drop share/debian-edu-config/tools/password-fix-squeeze-r0 for the same
+ reason.
+ * Drop stuff commented out in 2012 in ldap-bootstrap/root.ldif.
+ * Drop debian/debian-edu-config.preinst obsolete since buster development
+ had begun.
-- Wolfgang Schweer <wschweer at arcor.de> Tue, 08 Oct 2019 23:10:38 +1300
=====================================
debian/debian-edu-config.preinst deleted
=====================================
@@ -1,50 +0,0 @@
-#!/bin/sh
-
-set -e
-
-rm_conffile() {
- PKGNAME="$1"
- CONFFILE="$2"
-
- if [ -e "$CONFFILE" ]; then
- md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
- old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE's/.* //p\"`"
- if [ "$md5sum" != "$old_md5sum" ]; then
- echo "Obsolete conffile $CONFFILE has been modified by you."
- echo "Saving as $CONFFILE.dpkg-old ..."
- mv -f "$CONFFILE" "$CONFFILE".dpkg-old
- else
- echo "Removing obsolete conffile $CONFFILE ..."
- rm -f "$CONFFILE"
- fi
- fi
-}
-# Prepare to move a conffile without triggering a dpkg question. From
-# http://wiki.debian.org/DpkgConffileHandling
-prep_mv_conffile() {
- local PKGNAME="$1"
- local CONFFILE="$2"
-
- [ -e "$CONFFILE" ] || return 0
-
- local md5sum="$(md5sum $CONFFILE | sed -e 's/ .*//')"
- local old_md5sum="$(dpkg-query -W -f='${Conffiles}' $PKGNAME | \
- sed -n -e "\' $CONFFILE ' { s/ obsolete$//; s/.* //; p }")"
- if [ "$md5sum" = "$old_md5sum" ]; then
- rm -f "$CONFFILE"
- fi
-}
-
-case "$1" in
-install)
- ;;
-upgrade)
-
- # Just in case linking has already been done manually to now obsolete file.
- if dpkg --compare-versions "$2" le "1.818+deb8u1" && [ -L /etc/firefox-esr/debian-edu-networked.js ] ; then
- rm /etc/firefox-esr/debian-edu-networked.js
- fi
- ;;
-esac
-
-#DEBHELPER#
=====================================
ldap-bootstrap/root.ldif
=====================================
@@ -147,18 +147,3 @@ description: All system administrators with full LDAP access
member: cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no
member: cn=gosa-admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no
-# This group is not used, as GOsa uses LDAP bind to authenticate
-# users.
-# FIXME See if this is still true after Squeeze.
-#dn: cn=ldap-auth,ou=ldap-access,dc=skole,dc=skolelinux,dc=no
-#objectClass: top
-#objectClass: groupOfNames
-#cn: ldap-auth
-#description: Users allowed to authenticate using LDAP instead of Kerberos
-#member: cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no
-#member: cn=gosa-admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no
-#member: cn=kadmin-service,cn=kerberos,dc=skole,dc=skolelinux,dc=no
-#member: cn=kdc-service,cn=kerberos,dc=skole,dc=skolelinux,dc=no
-#member: cn=smbadmin,ou=samba,dc=skole,dc=skolelinux,dc=no
-#member: uid=super-admin,ou=people,dc=skole,dc=skolelinux,dc=no
-
=====================================
ldap-tools/ldap-debian-edu-install
=====================================
@@ -396,7 +396,7 @@ EOF
fi
done
- # in Etch, Lenny, Squeeze..., the database must be owned by openldap
+ # the database must be owned by openldap
if getent passwd openldap | grep -q openldap ; then
chown -R openldap:openldap /var/lib/ldap
fi
@@ -541,7 +541,7 @@ EOF
# slapd version 2.4.23-4.
# A better way is to convert our configuration to slapd.d config and
# include those files in the package.
- # Disabled after openldap in squeeze (since 2.4.23-5) no longer
+ # Disabled since openldap (>= 2.4.23-5) no longer
# require slapd.d config.
if false && [ ! -d /etc/ldap/slapd.d ] ; then
echo "info: migrating SLAPD configuration to slapd.d format"
@@ -554,8 +554,7 @@ EOF
killall slapd
fi
- # again: in Etch, Lenny, Squeeze..., the database must be owned by
- # openldap
+ # again: the database must be owned by openldap
if getent passwd openldap | grep -q openldap ; then
chown -R openldap:openldap /var/lib/ldap
fi
=====================================
share/debian-edu-config/tools/password-fix-squeeze-r0 deleted
=====================================
@@ -1,14 +0,0 @@
-#!/bin/bash
-#
-# /usr/share/debian-edu-config/tools/password-fix-squeeze-r0
-#
-# Fix password expiring after 2 days (#664596) incorrectly introdiced
-# in Debian Edu Squeeze up to r0; for new users the password will
-# never expire. For existing users this will be the case after they've
-# changed their password. Give old users the chance to change the
-# password, exclude not affected accounts: templates and first user.
-#
-for i in $(getent passwd | egrep "home[0-9]" | egrep -v 'newteacher|newstudent|:1000:1000:' | cut -d: -f1) ; do
- kadmin.local -q "modprinc -pwexpire 7000days $i"
-done
-kadmin.local -q "modpol -maxlife 0secs users"
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/compare/6c9a9252f646ddb964e60eb08e3b220e8cc4537d...97f4f635a809ee2ea223d0f9df7c260d17873ed3
--
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/compare/6c9a9252f646ddb964e60eb08e3b220e8cc4537d...97f4f635a809ee2ea223d0f9df7c260d17873ed3
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/20191008/f2d253eb/attachment-0001.html>
More information about the debian-edu-commits
mailing list