[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] 6 commits: share/debian-edu-config/tools/wpad-extract: Update IP of www.debian.org.

[Mike Gabriel (@sunweaver)]

Mike Gabriel pushed to branch master at Debian Edu / debian-edu-config


Commits:
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>

- - - - -


4 changed files:

- debian/changelog
- debian/debian-edu-config.maintscript
- share/debian-edu-config/tools/fetch-rootca-cert
- share/debian-edu-config/tools/wpad-extract


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,19 @@
+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 ]


=====================================
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/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/af351fcddaa095badc9469c12b83d7eb528cc39c...a673e678d0eb0056520aa9db6395a04caaaabf51

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/af351fcddaa095badc9469c12b83d7eb528cc39c...a673e678d0eb0056520aa9db6395a04caaaabf51
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/20240131/97584676/attachment-0001.htm>