[debian-edu-commits] [Git][debian-edu/debian-edu-config][bookworm] 14 commits: share/debian-edu-config/tools/update-proxy-from-wpad: Ignore missing dconf...
Mike Gabriel (@sunweaver)
gitlab at salsa.debian.org
Thu Feb 1 16:02:56 GMT 2024
Mike Gabriel pushed to branch bookworm at Debian Edu / debian-edu-config
Commits:
32d38f7a by Mike Gabriel at 2023-12-09T08:14:07+01:00
share/debian-edu-config/tools/update-proxy-from-wpad: Ignore missing dconf command. (Closes: #1057777).
This might happen on main-server installations without
a desktop environment installed.
- - - - -
a09e5939 by Mike Gabriel at 2023-12-09T08:17:12+01:00
release as 2.12.42
- - - - -
569574ca by Holger Levsen at 2023-12-25T11:33:09+01:00
Start 2.12.43 development.
d/changelog entries will be written on release
using the git commit messages.
Use 'gbp dch --since 2.12.42'
to write d/changelog entries since that last release.
Gbp-Dch: ignore
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
f9545b61 by Holger Levsen at 2023-12-25T11:34:42+01:00
d/changelog: add missing Closes: for #1021688, #1024033 and #1039461 in previous entries.
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
e912fcec by Holger Levsen at 2023-12-25T11:43:42+01:00
d/changelog: fix too long line in previous entry.
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
af351fcd by Holger Levsen at 2023-12-25T11:56:59+01:00
release as 2.12.43
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
abfd8575 by Mike Gabriel at 2024-01-31T15:05:33+01:00
share/debian-edu-config/tools/wpad-extract: Update IP of www.debian.org.
- - - - -
014c4f95 by Mike Gabriel at 2024-01-31T15:05:33+01:00
share/debian-edu-config/tools/wpad-extract: Don't use the proxy for accessing wpad.
- - - - -
cfbbee50 by Mike Gabriel at 2024-01-31T15:05:33+01:00
share/debian-edu-config/tools/fetch-rootca-cert: Don't use the proxy for accessing wwww.intern.
- - - - -
cf1531c2 by Mike Gabriel at 2024-01-31T15:06:26+01:00
debian/debian-edu-config.maintscript: Remove stray /etc/dhcp/dhclient-exit-hooks.d/fetch-ldap-cert. Should have been removed with 2.12.34 already. (Closes: #1061560).
- - - - -
d190aa94 by Mike Gabriel at 2024-01-31T15:06:37+01:00
debian/debian-edu-config.maintscript: Use prio-version version numbers as recommended on the dpkg-maintscript-helper man page (the current upload version suffixed by '~').
- - - - -
a673e678 by Mike Gabriel at 2024-01-31T15:13:23+01:00
release 2.12.44
Signed-off-by: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
- - - - -
38dff52b by Mike Gabriel at 2024-02-01T10:51:46+01:00
Merge tag '2.12.44' into bookworm
release as 2.12.44
- - - - -
443c99b5 by Mike Gabriel at 2024-02-01T10:53:13+01:00
release to bookworm as 2.12.44~deb12u1
- - - - -
5 changed files:
- debian/changelog
- debian/debian-edu-config.maintscript
- share/debian-edu-config/tools/fetch-rootca-cert
- share/debian-edu-config/tools/update-proxy-from-wpad
- share/debian-edu-config/tools/wpad-extract
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,43 @@
+debian-edu-config (2.12.44~deb12u1) bookworm; urgency=medium
+
+ * Upload to bookworm.
+
+ -- Mike Gabriel <sunweaver at debian.org> Thu, 01 Feb 2024 10:52:12 +0100
+
+debian-edu-config (2.12.44) unstable; urgency=medium
+
+ * share/debian-edu-config/tools/wpad-extract:
+ + Update IP of www.debian.org.
+ + Don't use the proxy for accessing wpad.
+ * share/debian-edu-config/tools/fetch-rootca-cert:
+ + Don't use the proxy for accessing wwww.intern.
+ * debian/debian-edu-config.maintscript:
+ + Remove stray /etc/dhcp/dhclient-exit-hooks.d/fetch-ldap-cert. Should have
+ been removed with 2.12.34 already. (Closes: #1061560).
+ + Use <prior-version> version numbers as recommended on the
+ dpkg-maintscript-helper man page (the current upload version suffixed
+ by '~').
+
+ -- Mike Gabriel <sunweaver at debian.org> Wed, 31 Jan 2024 15:07:09 +0100
+
+debian-edu-config (2.12.43) unstable; urgency=medium
+
+ [ Holger Levsen ]
+ * d/changelog:
+ - add missing Closes: for #1021688, #1024033 and #1039461 in previous
+ entries to ease future debugging.
+ - fix too long line in previous entry.
+
+ -- Holger Levsen <holger at debian.org> Mon, 25 Dec 2023 11:56:02 +0100
+
+debian-edu-config (2.12.42) unstable; urgency=medium
+
+ * share/debian-edu-config/tools/update-proxy-from-wpad: Ignore missing dconf
+ command. (Closes: #1057777). It might be missing on main-server
+ installations where no desktop environment is installed.
+
+ -- Mike Gabriel <sunweaver at debian.org> Sat, 09 Dec 2023 08:15:45 +0100
+
debian-edu-config (2.12.41~deb12u1) bookworm; urgency=medium
* Upload to bookworm.
@@ -238,6 +278,12 @@ debian-edu-config (2.12.33) unstable; urgency=medium
configuration in /etc/icingaweb2/modules/monitoring/. Instead of adjusting
single files and directories, enforce sensible permissions on all directories
and configuration files. Closes: #1039475.
+ * cf3/cf.samba: fix samba usershares permissions:
+ Setting the group ownership of /var/lib/samba/usershares/ to "students" fails
+ during the installation because this group is defined in LDAP and the slapd is
+ not running at the time the samba promise bundle is evaluated. Thus use the
+ numeric GID instead. The group is defined in
+ ldap-bootstrap/{samba.ldif,gosa.ldif}. Closes: #1039461.
-- Mike Gabriel <sunweaver at debian.org> Sat, 01 Jul 2023 05:41:56 +0200
@@ -315,7 +361,7 @@ debian-edu-config (2.12.25) unstable; urgency=medium
[ Wolfgang Schweer ]
* sbin/debian-edu-ltsp-install: Install firefox-esr l10n package conditionally
- in case the minidesktop thin client type has been chosen.
+ in case the minidesktop thin client type has been chosen. Closes: #1024033.
-- Holger Levsen <holger at debian.org> Sun, 13 Nov 2022 14:57:03 +0100
@@ -342,7 +388,7 @@ debian-edu-config (2.12.23) unstable; urgency=medium
desktop environment is used during an installation including the Main server
or LTSP server profile. (In these cases, ConnMan as the preferred LXQt
network manager doesn't work well with the Debian Edu specific way network
- interfaces are set up.)
+ interfaces are set up.) Closes: #1021688.
-- Holger Levsen <holger at debian.org> Mon, 17 Oct 2022 21:56:43 +0200
=====================================
debian/debian-edu-config.maintscript
=====================================
@@ -1,5 +1,6 @@
-rm_conffile /share/debian-edu-config/debian-edu.addmachine.template 2.12.5
-rm_conffile /share/debian-edu-config/debian-edu.ldapscripts.passwd 2.12.5
-rm_conffile /etc/cfengine3/debian-edu/cf.ldapscripts 2.12.5
-dir_to_symlink /etc/debian-edu/host-keytabs /var/lib/debian-edu/host-keytabs 2.12.17
-rm_conffile /etc/init.d/fetch-ldap-cert 2.12.33
+rm_conffile /share/debian-edu-config/debian-edu.addmachine.template 2.12.6~
+rm_conffile /share/debian-edu-config/debian-edu.ldapscripts.passwd 2.12.6~
+rm_conffile /etc/cfengine3/debian-edu/cf.ldapscripts 2.12.6~
+dir_to_symlink /etc/debian-edu/host-keytabs /var/lib/debian-edu/host-keytabs 2.12.18~
+rm_conffile /etc/init.d/fetch-ldap-cert 2.12.34~
+rm_conffile /etc/dhcp/dhclient-exit-hooks.d/fetch-ldap-cert 2.12.44~
=====================================
share/debian-edu-config/tools/fetch-rootca-cert
=====================================
@@ -10,6 +10,12 @@ if [ -r /etc/debian-edu/config ] ; then
. /etc/debian-edu/config
fi
+# Don't use the proxy for accesing www.intern
+if [ -n "${no_proxy}" ]; then
+ no_proxy="${no_proxy},"
+fi
+export no_proxy="${no_proxy}www.intern"
+
BUNDLECRT=/etc/ssl/certs/debian-edu-bundle.crt
ROOTCACRT=/etc/ssl/certs/Debian-Edu_rootCA.crt
LOCALCACRT=/usr/local/share/ca-certificates/Debian-Edu_rootCA.crt
=====================================
share/debian-edu-config/tools/update-proxy-from-wpad
=====================================
@@ -97,6 +97,13 @@ update_apt_conf() {
}
update_dconf() {
+ if ! command -v dconf >/dev/null; then
+ # If the dconf command is not install, let's ignore it.
+ # This might happen on main-server installations without
+ # a desktop environment installed.
+ return 0
+ fi
+
proxy_host="${http_proxy#*://}"
proxy_port="${proxy_host##*:}"
proxy_host="${proxy_host%:*}"
=====================================
share/debian-edu-config/tools/wpad-extract
=====================================
@@ -7,10 +7,16 @@
# This version uses pactester from package libpacparser1.
+# Don't use the proxy for accesing wpad
+if [ -n "${no_proxy}" ]; then
+ no_proxy="${no_proxy},"
+fi
+export no_proxy="${no_proxy}wpad"
+
# Look up one of the www.debian.org IP addresses to avoid hanging on
# DNS if the skolelinux machines are not connected to the Internet.
proxy_url=$(curl -s http://wpad/wpad.dat | pactester -p - \
- -u http://130.89.148.14 | awk '{print $2}' | cut -d';' -f1)
+ -u http://130.89.148.77 | awk '{print $2}' | cut -d';' -f1)
if [ "$proxy_url" ]; then
echo "http://$proxy_url"
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/04095f338c6fe7939d7fc5fd7b33dd68ff8d599f...443c99b58489da5a876327985ff5b71bdc0236de
--
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/04095f338c6fe7939d7fc5fd7b33dd68ff8d599f...443c99b58489da5a876327985ff5b71bdc0236de
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/20240201/6309cc07/attachment-0001.htm>
More information about the debian-edu-commits
mailing list