[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] 3 commits: debian/tests/control: Remove configure-edu-gateway from list of tests. Script...
Mike Gabriel (@sunweaver)
gitlab at salsa.debian.org
Sat Aug 19 16:22:58 BST 2023
Mike Gabriel pushed to branch master at Debian Edu / debian-edu-config
Commits:
55d14403 by Mike Gabriel at 2023-08-19T17:04:29+02:00
debian/tests/control: Remove configure-edu-gateway from list of tests. Script and testscript are now gone.
- - - - -
09513259 by Mike Gabriel at 2023-08-19T17:21:22+02:00
Silence lintian warnings of type 'bash-term-in-posix-shell' by using variable names that lintian can't confuse with bash-only pre-set variables (e.g. $HOSTNAME or $UID).
- - - - -
f741cf36 by Mike Gabriel at 2023-08-19T17:22:29+02:00
release as 2.12.35
- - - - -
8 changed files:
- debian/changelog
- debian/debian-edu-config.lintian-overrides
- debian/tests/control
- sbin/update-hostname-from-ip
- share/debian-edu-config/d-i/pre-pkgsel
- share/debian-edu-config/tools/gosa-create
- share/debian-edu-config/tools/gosa-remove
- share/debian-edu-config/tools/kerberos-kdc-init
Changes:
=====================================
debian/changelog
=====================================
@@ -1,14 +1,29 @@
-debian-edu-config (2.12.35) UNRELEASED; urgency=medium
+debian-edu-config (2.12.35) unstable; urgency=medium
- * Start 2.12.35 development.
-
- d/changelog entries will be written on release using the git commit
- messages.
-
- Use 'gbp dch --since 2.12.34' to write d/changelog entries since that
- last release.
+ [ Guido Berhoerster ]
+ * Remove configure-edu-gateway. (Closes: #1043407).
+ The script is obsoleted by the more sophisticated configuration
+ abilities provided by the debian-edu-router-config package.
+ * Do not hardcode X2Go desktop to Xfce. (Closes: #1049396).
+ Add a commandline option --x2go_desktop for specifying the default desktop
+ and make a best effort finding a usable desktop if none is specified.
+ * Disable cf-execd on installation. (Closes: #1041323).
+ Currently cf-execd is enabled by default if systemd is used (see #1043353)
+ but the agent should only be run on installation.
+ * Do not attempt to fetch the rootCA cert outside of a DebianEdu network
+ An error should only be reported if the machine is inside a DebianEdu
+ network, i.e. www.intern is resolvable, but the download fails. (Closes:
+ #1008599).
- -- Mike Gabriel <sunweaver at debian.org> Thu, 10 Aug 2023 17:32:46 +0200
+ [ Mike Gabriel ]
+ * debian/tests/control: Remove configure-edu-gateway from list of tests.
+ Script and testscript are now gone. (Related to closure of #1043407, see
+ above).
+ * Silence lintian warnings of type 'bash-term-in-posix-shell' by using
+ variable names that lintian can't confuse with bash-only pre-set
+ variables (e.g. $HOSTNAME or $UID).
+
+ -- Mike Gabriel <sunweaver at debian.org> Sat, 19 Aug 2023 17:00:36 +0200
debian-edu-config (2.12.34) unstable; urgency=medium
=====================================
debian/debian-edu-config.lintian-overrides
=====================================
@@ -22,16 +22,3 @@ debian-edu-config: unused-debconf-template debian-edu-config/ldap-password [temp
debian-edu-config: unused-debconf-template debian-edu-config/ldap-password-again [templates:359]
debian-edu-config: unused-debconf-template debian-edu-config/ldap-password-empty [templates:442]
debian-edu-config: unused-debconf-template debian-edu-config/ldap-password-mismatch [templates:401]
-debian-edu-config: bash-term-in-posix-shell '$HOSTNAME' [usr/sbin/update-hostname-from-ip:117]
-debian-edu-config: bash-term-in-posix-shell '$HOSTNAME' [usr/sbin/update-hostname-from-ip:122]
-debian-edu-config: bash-term-in-posix-shell '$HOSTNAME' [usr/sbin/update-hostname-from-ip:124]
-debian-edu-config: bash-term-in-posix-shell '$HOSTNAME' [usr/sbin/update-hostname-from-ip:127]
-debian-edu-config: bash-term-in-posix-shell '$HOSTNAME' [usr/sbin/update-hostname-from-ip:128]
-debian-edu-config: bash-term-in-posix-shell '$HOSTNAME' [usr/share/debian-edu-config/d-i/pre-pkgsel:182]
-debian-edu-config: bash-term-in-posix-shell '$HOSTNAME' [usr/share/debian-edu-config/d-i/pre-pkgsel:183]
-debian-edu-config: bash-term-in-posix-shell '$HOSTNAME' [usr/share/debian-edu-config/d-i/pre-pkgsel:184]
-debian-edu-config: bash-term-in-posix-shell '$HOSTNAME' [usr/share/debian-edu-config/d-i/pre-pkgsel:198]
-debian-edu-config: bash-term-in-posix-shell '$HOSTNAME' [usr/share/debian-edu-config/tools/gosa-create:32]
-debian-edu-config: bash-term-in-posix-shell '$HOSTNAME' [usr/share/debian-edu-config/tools/gosa-remove:34]
-debian-edu-config: bash-term-in-posix-shell '$HOSTNAME' [usr/share/debian-edu-config/tools/gosa-remove:38]
-debian-edu-config: bash-term-in-posix-shell '$UID' [usr/share/debian-edu-config/tools/kerberos-kdc-init:253]
=====================================
debian/tests/control
=====================================
@@ -1,3 +1,3 @@
-Tests: install-task-pkgs, improve-desktop-l10n, configure-edu-gateway
+Tests: install-task-pkgs, improve-desktop-l10n
Depends: debian-edu-install, education-common, locales
Restrictions: needs-root allow-stderr
=====================================
sbin/update-hostname-from-ip
=====================================
@@ -110,22 +110,22 @@ if [ "127.0.0.1" = "$IP" ] ; then
fi
if [ "$IP" ] ; then
- HOSTNAME=$(ip2hostname $IP)
+ MY_HOSTNAME=$(ip2hostname $IP)
SOURCE="reverse DNS of $IP"
fi
-if $USEMAC && [ -z "$HOSTNAME" ] ; then
- HOSTNAME=$(ether2hostname $MAC)
+if $USEMAC && [ -z "$MY_HOSTNAME" ] ; then
+ MY_HOSTNAME=$(ether2hostname $MAC)
SOURCE="hardware MAC address"
fi
-if [ "$HOSTNAME" ]; then
+if [ "$MY_HOSTNAME" ]; then
if $onlyprint ; then
- echo $HOSTNAME
+ echo $MY_HOSTNAME
else
# Already got the correct host name?
- if [ "$HOSTNAME" != "$(uname -n)" ] ; then
- sethostname "$HOSTNAME" "$SOURCE"
+ if [ "$MY_HOSTNAME" != "$(uname -n)" ] ; then
+ sethostname "$MY_HOSTNAME" "$SOURCE"
fi
fi
else
=====================================
share/debian-edu-config/d-i/pre-pkgsel
=====================================
@@ -25,7 +25,7 @@ configure_network() {
fi
# Default hostname is 'localhost'
- HOSTNAME=localhost
+ MY_HOSTNAME=localhost
# Default DNS server is tjener.intern
NAMESERVER=10.0.2.2
@@ -55,7 +55,7 @@ configure_network() {
autoeth1=""
DNSDOMAIN=
MAILNAME=
- HOSTNAME=
+ MY_HOSTNAME=
eth0uuid=$(chroot /target uuid)
mkdir -p /target/etc/NetworkManager/system-connections
cat > /target/etc/NetworkManager/system-connections/eth0 <<EOF
@@ -80,7 +80,7 @@ EOF
autoeth1=""
DNSDOMAIN=
MAILNAME=
- HOSTNAME=
+ MY_HOSTNAME=
;;
Workstation)
# Use this unless Server also was choosen.
@@ -94,7 +94,7 @@ EOF
Main-Server)
# Override for workstations combining as servers
eth0=10.0.2.2:255.0.0.0:10.255.255.255:10.0.0.1
- HOSTNAME=tjener.intern
+ MY_HOSTNAME=tjener.intern
NAMESERVER=127.0.0.1
autoeth0="auto eth0"
;;
@@ -179,9 +179,9 @@ EOF
echo "ff02::3 ip6-allhosts"
) > /target/etc/hosts
- if [ ! -z "$HOSTNAME" ] ; then
- echo "$HOSTNAME" > /target/etc/hostname
- in-target /bin/hostname "$HOSTNAME"
+ if [ ! -z "$MY_HOSTNAME" ] ; then
+ echo "$MY_HOSTNAME" > /target/etc/hostname
+ in-target /bin/hostname "$MY_HOSTNAME"
fi
# Update hostname based on reverse DNS entry of current IP or
@@ -195,7 +195,7 @@ EOF
# Avoid hardcoding entries on the clients, to make sure IP address
# range can be changed on the clients by changing DHCP
# configuration on the server.
- if [ "tjener.intern" = "$HOSTNAME" ] ; then
+ if [ "tjener.intern" = "$MY_HOSTNAME" ] ; then
(
echo
echo "10.0.2.2 tjener.intern tjener"
=====================================
share/debian-edu-config/tools/gosa-create
=====================================
@@ -12,7 +12,7 @@ set -e
## directory already exists. In both cases nothing should happen.
PREFIX=/skole
-HOSTNAME=$(hostname -s)
+MY_HOSTNAME=$(hostname -s)
USERID=$1
#FIXME Change this ldap search to only find new users, to not slow down as more users are added.
@@ -29,7 +29,7 @@ while read KEY VALUE ; do
gidNumber:) GROUPID="$VALUE" ;;
"")
test "$HOMEDIR" || continue
- echo "$HOMEDIR" | grep -q "^$PREFIX/$HOSTNAME" || continue
+ echo "$HOMEDIR" | grep -q "^$PREFIX/$MY_HOSTNAME" || continue
test -e "$HOMEDIR" && continue
cp -r /etc/skel $HOMEDIR
if type nscd > /dev/null 2>&1 ; then
=====================================
share/debian-edu-config/tools/gosa-remove
=====================================
@@ -28,14 +28,14 @@ MAXAGE_SEC=$(( $MAXAGE_DAYS*24*60*60 ))
[ -d $HOMEDIR ] || exit 1
PREFIX=/skole
-HOSTNAME=$(hostname -s)
+MY_HOSTNAME=$(hostname -s)
# Obviously a user template was removed. Ignoring.
-echo "$HOMEDIR" | egrep -q "^$PREFIX/$HOSTNAME.*/%uid" && exit 0
+echo "$HOMEDIR" | egrep -q "^$PREFIX/$MY_HOSTNAME.*/%uid" && exit 0
# An LDAP user that did not have their home at a place we manage with this script
# has been removed. This should not happen. Exiting with error.
-echo "$HOMEDIR" | egrep -q "^$PREFIX/$HOSTNAME.*$USERID" || exit 1
+echo "$HOMEDIR" | egrep -q "^$PREFIX/$MY_HOSTNAME.*$USERID" || exit 1
## move mail directory to home directory
if [ -d /var/mail/$USERID ]; then
=====================================
share/debian-edu-config/tools/kerberos-kdc-init
=====================================
@@ -248,9 +248,9 @@ firstuser_post() {
cp -r /etc/skel $HOMEDIR
# Must use uid/gid as NSS is not able to connect to LDAP yet
- UID=1000
- GID=1000
- chown -R $UID:$GID $HOMEDIR
+ FIRSTUSERUID=1000
+ FIRSTUSERGID=1000
+ chown -R $FIRSTUSERUID:$FIRSTUSERGID $HOMEDIR
pwlen=$(echo -n "$FIRSTUSERPWD" | wc -c)
echo "Creating Kerberos principal for $USERDN (password length $pwlen)"
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/8412a3d917233ac414b05315f3dc95275bcb75b9...f741cf36a517f273f942159898f073c86e9a8ad7
--
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/8412a3d917233ac414b05315f3dc95275bcb75b9...f741cf36a517f273f942159898f073c86e9a8ad7
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/20230819/8e761548/attachment-0001.htm>
More information about the debian-edu-commits
mailing list