[debian-edu-commits] [Git][debian-edu/debian-edu-config][trixie] 23 commits: libexec/debian-edu-apache2-update-tjener-aliases: Stop modifying the...
Mike Gabriel (@sunweaver)
gitlab at salsa.debian.org
Mon Nov 9 09:52:47 GMT 2026
Mike Gabriel pushed to branch trixie at Debian Edu / debian-edu-config
Commits:
ee263553 by Mike Gabriel at 2026-11-07T23:25:10+01:00
libexec/debian-edu-apache2-update-tjener-aliases: Stop modifying the apache2_tjener-aliases.map under /usr at runtime
Instead, create a copy on first install to /var/lib/debian-edu/ and
update it there in regular intervals.
Plus some typo/grammar fixes.
(Closes: #153381)
- - - - -
79cfefad by Mike Gabriel at 2026-11-07T23:25:26+01:00
etc/apache2/sites-available/debian-edu-default.conf: Don't redirect sitesummary-client requests to https
The sitesummary-client tool cannot handle 302-moved-permanently return codes
gracefully and aborts with failure.
(Closes: #1153379).
- - - - -
a4398109 by Mike Gabriel at 2026-11-07T23:30:43+01:00
share/debian-edu-config/tools/run-at-firstboot: Fix indentation in LTSP image creation code block. Make script more readable.
- - - - -
4c61baee by Mike Gabriel at 2026-11-07T23:36:22+01:00
Makefile: Fix file rename of apache2_tjener-aliases.map to apache2_tjener-aliases.map.template
Complements commit: ee263553b7d40b4a0fda05b5877a31464eef8338
- - - - -
a8325aed by Mike Gabriel at 2026-11-08T01:13:50+01:00
debian/debian-edu-config.postinst: Only create /var/lib/debian-edu/apache2_tjener-aliases.map on the Main-Server
- - - - -
52372442 by Mike Gabriel at 2026-11-08T18:52:54+01:00
cf3/cf.ldapserver: Drop 'export' from variable declaration in /etc/default/slapd
This does not get understood by systemd:
```
<datetime> tjener systemd[1]: slapd.service: Ignoring invalid
environment assignment 'export KRB5_KTNAME=/etc/krb5.keytab.ldap':
/etc/default/slapd
```
(Closes: #1153429).
- - - - -
a6d83451 by Mike Gabriel at 2026-11-08T18:55:53+01:00
cf3/cf.ldapserver: Stop sneaking in ulimit -n 32768 call into /etc/default/slapd
If this really still needed, we need to bring up the topic with the
slapd maintainers in Debian or tweak the slapd.service systemd unit
itself.
(Closes: #1153454).
- - - - -
b9a55a64 by Mike Gabriel at 2026-11-08T20:07:03+01:00
cf3/cf.cfengine3: Ensure that all cfengine3 related sub-services get stopped and disabled during finish-install
(Closes: #1153457).
- - - - -
2a230b21 by Mike Gabriel at 2026-11-08T21:15:29+01:00
sbin/debian-edu-ltsp-install: Mark DLW / TC chroots as successfully created once the package installation is complete
- - - - -
52848146 by Mike Gabriel at 2026-11-08T21:45:53+01:00
share/debian-edu-config/{d-i/finish-install,tools/run-at-first-boot: Move X2Go ThinClient creation into run-at-firstboot script (if LTSP-Server profile gets installed)
To ensure success of the X2Go ThinClient creation, check wether the
installation has been successful at previous boots. If not, try to start
from scratch. (See: #1153430).
(Closes: #1153431).
- - - - -
31219488 by Mike Gabriel at 2026-11-08T21:49:26+01:00
run-at-firstboot: Re-try DLW chroot creation if previous attempt was not successful
This can, for example, happen if the server got rebooted to quickly
after the first boot, although the DLW chroot creation had not finished.
(Closes: #1153430).
- - - - -
077a602e by Mike Gabriel at 2026-11-08T21:54:24+01:00
d/changelog: update from Git history
- - - - -
a3cd67ce by Mike Gabriel at 2026-11-08T21:55:05+01:00
d/changelog: fix bug number in bug closure
- - - - -
11f2a272 by Mike Gabriel at 2026-11-08T23:46:02+01:00
cf3/cf.cfengine3: In fact, cfengine3 in a D-I chroot fails to mask systemd services, so providing an alternative via shell during D-I / FAI installation. (Closes: #1153457).
Also, mask the services, not just disable.
- - - - -
6d3b444b by Mike Gabriel at 2026-11-08T23:48:02+01:00
d/changelog: update from Git history
- - - - -
9caada60 by Mike Gabriel at 2026-11-09T00:26:46+01:00
cf3/cf.cfengine3: Simplify. Use systemctl calls always.
- - - - -
883fffad by Mike Gabriel at 2026-11-09T00:43:57+01:00
Revert "cf3/cf.cfengine3: Simplify. Use systemctl calls always."
This reverts commit 9caada60507ae6a5737f5e6b0d8072f2f531890d.
- - - - -
47b71cae by Mike Gabriel at 2026-11-09T00:44:11+01:00
cf3/cf.cfengine3: Simplify. Use systemctl calls always.
- - - - -
52f1ff5a by Mike Gabriel at 2026-11-09T00:44:11+01:00
update-firefox-homepage: With Firefox-ESR in Debian 13.7/13.8 the browser.startup.homepage only needs the URL. (Closes: #1153470).
- - - - -
e052e08f by Mike Gabriel at 2026-11-09T00:57:51+01:00
run-at-firstboot: Capture the case that the DLW/X2GoTC chroots don't yet exist.
- - - - -
ce89adfd by Mike Gabriel at 2026-11-09T01:22:04+01:00
release as 2.13.7
Signed-off-by: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
- - - - -
7216c08c by Mike Gabriel at 2026-11-09T01:23:11+01:00
Merge tag '2.13.7' into trixie
released as 2.13.7
- - - - -
0fa949ca by Mike Gabriel at 2026-11-09T01:24:10+01:00
release to trixie as 2.13.7~deb13u1
Signed-off-by: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
- - - - -
12 changed files:
- Makefile
- cf3/cf.cfengine3
- cf3/cf.ldapserver
- debian/changelog
- debian/debian-edu-config.postinst
- etc/apache2/sites-available/debian-edu-default.conf
- libexec/debian-edu-apache2-update-tjener-aliases
- sbin/debian-edu-ltsp-install
- share/debian-edu-config/apache2_tjener-aliases.map → share/debian-edu-config/apache2_tjener-aliases.map.template
- share/debian-edu-config/d-i/finish-install
- share/debian-edu-config/tools/run-at-firstboot
- share/debian-edu-config/tools/update-firefox-homepage
Changes:
=====================================
Makefile
=====================================
@@ -359,7 +359,7 @@ install: install-testsuite
$(INSTALL_DATA) sbin/debian-edu-fsautoresizetab $(DESTDIR)/usr/share/debian-edu-config/fsautoresizetab
set -e ; for f in \
- share/debian-edu-config/apache2_tjener-aliases.map \
+ share/debian-edu-config/apache2_tjener-aliases.map.template \
share/debian-edu-config/avahi.smb.service \
share/debian-edu-config/rsyslog-collector \
share/debian-edu-config/rsyslog-filters \
=====================================
cf3/cf.cfengine3
=====================================
@@ -1,15 +1,12 @@
bundle agent cfengine3
{
-# Disable cfengine3 services which are enabled by default when systemd is used (#1043353)
+# Mask cfengine3 services which are enabled by default when systemd is used (#1043353)
-services:
+commands:
- debian.systemd.installation::
+ debian.installation::
- "cfengine3.service"
- service_policy => "stop";
-
- "cfengine3.service"
- service_policy => "disable";
+ "/bin/systemctl mask cfengine3.service cf-apache.service cf-execd.service cf-hub.service cf-monitord.service cf-postgres.services cf-reactor.service cf-serverd.service"
+ contain => in_shell;
}
=====================================
cf3/cf.ldapserver
=====================================
@@ -30,9 +30,8 @@ bundle agent editline_ldapserver
vars:
"default" slist => { "SLAPD_SERVICES=\"ldap:/// ldaps:/// ldapi:///\"",
- "export KRB5_KTNAME=/etc/krb5.keytab.ldap",
- "SLAPD_OPTIONS=\"-4\"",
- "ulimit -n 32768" };
+ "KRB5_KTNAME=/etc/krb5.keytab.ldap",
+ "SLAPD_OPTIONS=\"-4\"" };
files:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,57 @@
+debian-edu-config (2.13.7~deb13u1) trixie; urgency=medium
+
+ * Release to trixie.
+
+ -- Mike Gabriel <sunweaver at debian.org> Mon, 09 Nov 2026 01:23:30 +0100
+
+debian-edu-config (2.13.7) unstable; urgency=medium
+
+ * libexec/debian-edu-apache2-update-tjener-aliases:
+ - Stop modifying the apache2_tjener-aliases.map under /usr at runtime.
+ Instead, create a copy on first install to /var/lib/debian-edu/ and
+ update it there in regular intervals. Plus some typo/grammar fixes.
+ (Closes: #1153381).
+ - debian/debian-edu-config.postinst: Only create initial version of
+ /var/lib/debian-edu/apache2_tjener-aliases.map on the Main-Server.
+ * etc/apache2/sites-available/debian-edu-default.conf:
+ - Don't redirect sitesummary-client requests to https.
+ The sitesummary-client tool cannot handle 302-moved-permanently
+ return codes gracefully and aborts with failure. (Closes:
+ #1153379).
+ * sbin/debian-edu-ltsp-install:
+ - Mark DLW / TC chroots as successfully created once the package
+ installation is complete
+ * share/debian-edu-config/tools/run-at-firstboot:
+ - Fix indentation in LTSP image creation code block. Make script more
+ readable.
+ - Re-try DLW chroot creation if previous attempt was not successful.
+ This can, for example, happen if the server got rebooted to quickly
+ after the first boot, although the DLW chroot creation had not finished.
+ (Closes: #1153430).
+ * share/debian-edu-config/{d-i/finish-install,tools/run-at-first-boot:
+ - Move X2Go ThinClient creation into run-at-firstboot script (if LTSP-
+ Server profile gets installed). To ensure success of the X2Go ThinClient
+ creation, check wether the installation has been successful at previous
+ boots. If not, try to start from scratch. (See also: #1153430).
+ (Closes: #1153431).
+ * cf3/cf.ldapserver:
+ - Drop 'export' from variable declaration in /etc/default/slapd.
+ This does not get understood by systemd. (Closes: #1153429).
+ - Stop sneaking in ulimit -n 32768 call into /etc/default/slapd.
+ If this really still needed, we need to bring up the topic with the
+ slapd maintainers in Debian or tweak the slapd.service systemd unit
+ itself. (Closes: #1153454).
+ * cf3/cf.cfengine3:
+ - Ensure that all cfengine3 related sub-services get stopped and masked
+ during finish-install.
+ - In fact, simplify cfengine3 service deactivations and use systemctl to
+ mask those services. (Closes: #1153457).
+ * update-firefox-homepage:
+ - With Firefox-ESR in Debian 13.7/13.8 the browser.startup.homepage only
+ needs the URL. (Closes: #1153470).
+
+ -- Mike Gabriel <sunweaver at debian.org> Mon, 09 Nov 2026 00:46:06 +0100
+
debian-edu-config (2.13.6~deb13u1) trixie; urgency=medium
* Release to trixie.
=====================================
debian/debian-edu-config.postinst
=====================================
@@ -217,6 +217,13 @@ if grep -q Main-Server /etc/debian-edu/config; then
fi
fi
+# On the main-server, take the /usr/share/debian-edu-config/apache2_tjener-aliases.map.template and create its runtime counterpart from it.
+if grep -q Main-Server /etc/debian-edu/config; then
+ if [ ! -e /var/lib/debian-edu/apache2_tjener-aliases.map ]; then
+ cp /usr/share/debian-edu-config/apache2_tjener-aliases.map.template /var/lib/debian-edu/apache2_tjener-aliases.map
+ fi
+fi
+
# Register all changes done by this postinst script
if command -v etckeeper > /dev/null ; then
etckeeper commit "end of debian-edu-config postinst" || true
=====================================
etc/apache2/sites-available/debian-edu-default.conf
=====================================
@@ -8,24 +8,28 @@
UseCanonicalName On
RewriteEngine On
- RewriteMap tjeneralias "txt:/usr/share/debian-edu-config/apache2_tjener-aliases.map"
+ RewriteMap tjeneralias "txt:/var/lib/debian-edu/apache2_tjener-aliases.map"
# 1. Exclusions: Skip the redirect rules entirely for wpad.dat and Debian-Edu_rootCA.crt
RewriteCond %{REQUEST_URI} \.(?:dat|crt)$ [NC]
RewriteRule ^ - [L]
- # 2. Check if the requested HTTP Host matches Edu IP subnet e.g. 10.x.x.x/8 subnet..
+ # 2. Exclusions: sitesummary-client cannot handle 302 Moved permanently return codes
+ RewriteCond %{REQUEST_URI} ^/cgi-bin/sitesummary-collector\.cgi$ [NC]
+ RewriteRule ^ - [L]
+
+ # 3. Check if the requested HTTP Host matches Edu IP subnet e.g. 10.x.x.x/8 subnet..
# NOTE: Single IPs should be part of the TJENER alias map.
# NOTE: .999.999 is technically possible, but harmless.
RewriteCond %1 ^10\.\d{1,3}\.\d{1,3}\.\d{1,3}$ [OR]
- # 3. Path A (The Happy Path): HTTP Host is a known TJENER alias
+ # 4. Path A (The Happy Path): HTTP Host is a known TJENER alias
# We strip the port, check the map. If it matches, redirect preserving the requested name.
RewriteCond %{HTTP_HOST} ^([^:]+)
RewriteCond ${tjeneralias:%1|DENY} ^ALLOW$ [NC]
RewriteRule ^(.*)$ https://%{HTTP_HOST}/$1 [R=301,L]
- # 4. Path B (The Fallback): HTTP Host is not a known TJENER alias
+ # 5. Path B (The Fallback): HTTP Host is not a known TJENER alias
# If the request makes it past Rule 3 without triggering the [L] flag,
# it means the name was not in the map. We safely redirect to the static ServerName.
RewriteRule ^(.*)$ https://%{SERVER_NAME}/$1 [R=301,L]
=====================================
libexec/debian-edu-apache2-update-tjener-aliases
=====================================
@@ -18,7 +18,7 @@ set -euo pipefail
# Configuration
# -----------------------------------------------------------------------------
SCRIPT_PATH="/usr/libexec/debian-edu-config/debian-edu-apache2-update-tjener-aliases"
-MAP_FILE="/usr/share/debian-edu-config/apache2_tjener-aliases.map"
+MAP_FILE="/var/lib/debian-edu/apache2_tjener-aliases.map"
BACKUP_DIR="/var/backups/apache2-tjener-aliases"
LDAP_BASE="relativeDomainName=tjener,zoneName=intern,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no"
LDAP_OPTS="-x"
=====================================
sbin/debian-edu-ltsp-install
=====================================
@@ -563,6 +563,9 @@ debootstrap --arch="$arch" --no-check-gpg --variant=minbase --include=sitesummar
EOF
fi
+ # Mark the chroot as successfully created.
+ touch /srv/ltsp/x2go-"$thin_type"-"$arch"/CREATED_SUCCESSFULLY_$(date +%Y%m%d-%H%M)
+
if [ "$img" == "yes" ] ; then
ltsp image /srv/ltsp/x2go-"$thin_type"-"$arch"
fi
@@ -706,6 +709,9 @@ EOF
umount /srv/ltsp/dlw/media/cdrom
fi
+ # Mark the chroot as successfully created.
+ touch /srv/ltsp/dlw/CREATED_SUCCESSFULLY_$(date +%Y%m%d-%H%M)
+
# Create optional SquashFS image file.
if [ "yes" == "$img" ] ; then
ltsp image dlw
=====================================
share/debian-edu-config/apache2_tjener-aliases.map → share/debian-edu-config/apache2_tjener-aliases.map.template
=====================================
@@ -26,7 +26,7 @@ localhost ALLOW
# ---------------------------
# | Debian Edu defaults |
# ---------------------------
-# NOTE: 10.x.x.x/8 network is allowed, so next line is redundand.
+# NOTE: 10.x.x.x/8 network is allowed, so next line is redundant.
10.0.2.2 ALLOW
www ALLOW
www.intern ALLOW
@@ -38,7 +38,7 @@ ldap.intern ALLOW
# ----- IMPORTANT HAND-EDIT ADDITIONS -----
-# If a user browses to the raw IP and it is not here, it will trigger a 302
+# If a user browses to the raw IP and it is not listed here, it will trigger a 302
# response to a pre-defined server name.
# Add any other IP addresses assigned to Tjeners interfaces:
# 172.16.0.51 ALLOW
=====================================
share/debian-edu-config/d-i/finish-install
=====================================
@@ -64,18 +64,6 @@ fi
db_get debian-edu-install/profile
PROFILE="$RET"
-# Create LTSP thin client image and iPXE setup in case of a combined server.
-if echo "$PROFILE" | grep -Eq 'Main-Server.*LTSP-Server' ; then
- in-target /bin/sh -c "modprobe squashfs" || true
- in-target /bin/sh -c "modprobe loop" || true
- in-target /bin/sh -c "modprobe overlay" || true
- if in-target /bin/sh -c "/usr/sbin/debian-edu-ltsp-install --diskless_workstation no --thin_type bare" ; then
- log "info: Running 'debian-edu-ltsp-install' succeeded"
- else
- log "error: 'debian-edu-ltsp-install' failed"
- fi
-fi
-
# Register changes before and after cf-agent is executed, to make it
# easier to track our changes
edu-etcvcs commit
=====================================
share/debian-edu-config/tools/run-at-firstboot
=====================================
@@ -74,18 +74,30 @@ if ! is_ltsp_client; then
# If this runs on a combi server (Main-Server + LTSP-Server), create
# Diskless Workstation chroot from scratch as clean environment.
if echo "$PROFILE" | grep -Eq 'Main-Server' && \
- echo "$PROFILE" | grep -Eq 'LTSP-Server'; then
- if [ ! -d /srv/ltsp/dlw ]; then
- /usr/sbin/debian-edu-ltsp-install --dlw yes
- fi
+ echo "$PROFILE" | grep -Eq 'LTSP-Server'; then
+ if [ -d /srv/ltsp/dlw ] && [ -z "$(find /srv/ltsp/dlw/ -name "SUCCESSFULLY_CREATED_*")" ]; then
+ rm -Rf /srv/ltsp/dlw
+ fi
+ if [ ! -d /srv/ltsp/dlw ] || [ -n "$(find /srv/ltsp/dlw/ -name "SUCCESSFULLY_CREATED_*")" ]; then
+ /usr/sbin/debian-edu-ltsp-install --dlw yes
+ fi
# else if this runs on a pure LTSP-Server (no Main-Server role), then
# let's use the file system of the LTSP-Server and generate the LTSP
# image directly from it (faster!).
elif echo "$PROFILE" | grep -Eqv 'Main-Server' && \
- echo "$PROFILE" | grep -Eq 'LTSP-Server'; then
- if [ ! -f /srv/ltsp/images/$ltspimg ] ; then
- /usr/sbin/debian-edu-ltsp-install --diskless_workstation yes
- fi
+ echo "$PROFILE" | grep -Eq 'LTSP-Server'; then
+ if [ ! -f /srv/ltsp/images/$ltspimg ] ; then
+ /usr/sbin/debian-edu-ltsp-install --diskless_workstation yes
+ fi
+ fi
+ # Always create the thin client image for all LTSP-Server variants/combinations.
+ if echo "$PROFILE" | grep -Eq 'LTSP-Server'; then
+ if [ -d /srv/ltsp/x2go-bare-amd64 ] && [ -z "$(find /srv/ltsp/x2go-bare-amd64/ -name "SUCCESSFULLY_CREATED_*")" ]; then
+ rm -Rf /srv/ltsp/x2go-bare-amd64/
+ fi
+ if [ ! -d /srv/ltsp/x2go-bare-amd64 ] || [ -n "$(find /srv/ltsp/x2go-bare-amd64/ -name "SUCCESSFULLY_CREATED_*")" ]; then
+ /usr/sbin/debian-edu-ltsp-install --thin_type bare
+ fi
fi
fi
=====================================
share/debian-edu-config/tools/update-firefox-homepage
=====================================
@@ -26,7 +26,7 @@ if [ -z "$url" ] || [ "about:blank" = "$url" ]; then
else
cat > $etcfile.new <<EOF
# Generated from LDAP
-pref("browser.startup.homepage","data:text/plain,browser.startup.homepage=$url");
+pref("browser.startup.homepage","$url");
EOF
chmod 644 $etcfile.new
if cmp -s $etcfile $etcfile.new ; then
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/f264fe6c8e11a63c0cc25e412247174b1b9e4aff...0fa949ca09923a6a5556ebeab8e69dae89bd4d20
--
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/f264fe6c8e11a63c0cc25e412247174b1b9e4aff...0fa949ca09923a6a5556ebeab8e69dae89bd4d20
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20261109/f2106a9e/attachment-0001.htm>
More information about the debian-edu-commits
mailing list