[debian-edu-commits] [Git][debian-edu/debian-edu-config][mr/debian-edu-router] 9 commits: remove unnecessary article

Mike Gabriel (@sunweaver) gitlab at salsa.debian.org
Sun Jun 1 21:09:52 BST 2025 


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


Commits:
9978c9c8 by Frans Spiesschaert at 2024-12-21T12:38:09+01:00
remove unnecessary article

- - - - -
963af5c4 by Frans Spiesschaert at 2024-12-21T14:07:23+01:00
no longer give exim4 a reason to complain about "tainted search query is not properly quoted"

- - - - -
b4618325 by Frans Spiesschaert at 2024-12-21T14:17:32+01:00
remove extra space

- - - - -
fc0f918d by Holger Levsen at 2025-03-05T13:06:57+01:00
Remove myself from uploaders. It was a pleasure and an honor!

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
498829f1 by Holger Levsen at 2025-03-05T13:10:30+01:00
release as 2.12.46

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
e6225544 by Mike Gabriel at 2025-06-01T22:08:33+02:00
debian/control: Add to D: field: bind9-dnsutils. The 'dig' utility is required by fetch-rootca-cert script and various test scripts.

- - - - -
1373cfcc by Mike Gabriel at 2025-06-01T22:08:33+02:00
debian/control: Drop from D: field: libproxy1-plugin-*. All of them are transitional packages and libproxy has been replaced by libpacparser1 (using its pactester tool) ages ago. (Closes: #1064900).

- - - - -
9b5233bf by Daniel Teichmann at 2025-06-01T20:09:50+00:00
Add new file 'debian-edu-router.ldif'. Empty proxy groups should be installed on all new Tjeners.

These are preconfigured empty proxy groups for the use in Debian Edu Router.
See Debian Edu Router Plugin: Content filter at https://salsa.debian.org/debian-edu/debian-edu-router/-/tree/master/docs.

- - - - -
b84cbec2 by Daniel Teichmann at 2025-06-01T20:09:50+00:00
ldap-bootstrap/debian-edu-router.ldif: Add 'server-hosts' nisNetgroup to 'proxy-trusted' nisNetgroup, via 'memberNisNetgroup' attribute.

- - - - -


7 changed files:

- Makefile
- debian/changelog
- debian/control
- etc/exim4/exim-ldap-server-v4.conf
- + ldap-bootstrap/debian-edu-router.ldif
- ldap-tools/ldap-debian-edu-install
- sbin/debian-edu-pxeinstall


Changes:

=====================================
Makefile
=====================================
@@ -196,6 +196,7 @@ LDIFS = \
 	ltsp.ldif \
 	gosa.ldif \
 	gosa-server.ldif \
+	debian-edu-router.ldif \
 	$(NULL)
 
 LDAPPROGRAMS = \


=====================================
debian/changelog
=====================================
@@ -1,3 +1,19 @@
+debian-edu-config (2.12.46) unstable; urgency=medium
+
+  [ Holger Levsen ]
+  * Team upload.
+  * Remove myself from uploaders as discussed during FOSDEM. It was a pleasure
+    and an honor!
+
+  [ Frans Spiesschaert ]
+  * sbin/debian-edu-pxeinstall:
+    - remove unnecessary article.
+    - remove extra space.
+  * etc/exim4/exim-ldap-server-v4.conf: no longer give exim4 a reason to
+    complain about "tainted search query is not properly quoted".
+
+ -- Holger Levsen <holger at debian.org>  Wed, 05 Mar 2025 13:08:19 +0100
+
 debian-edu-config (2.12.45) unstable; urgency=medium
 
   * share/debian-edu-config/tools/gosa-sync:


=====================================
debian/control
=====================================
@@ -3,7 +3,6 @@ Section: misc
 Priority: optional
 Maintainer: Debian Edu Developers <debian-edu at lists.debian.org>
 Uploaders: Petter Reinholdtsen <pere at debian.org>,
-           Holger Levsen <holger at debian.org>,
            Mike Gabriel <sunweaver at debian.org>,
            Dominik George <natureshadow at debian.org>,
 Standards-Version: 4.6.2
@@ -22,6 +21,7 @@ Architecture: all
 Depends: ${misc:Depends},
          adduser,
          bind9-host,
+         bind9-dnsutils,
          cfengine3,
          debconf-utils,
          debian-edu-artwork,
@@ -42,9 +42,6 @@ Depends: ${misc:Depends},
          libnss3-tools,
          libpacparser1,
          libpam-python (>= 1.1.0~git20220701.1d4e111-0.3~),
-         libproxy1-plugin-kconfig,
-         libproxy1-plugin-webkit,
-         libproxy1-plugin-networkmanager,
          libsitesummary-perl,
          libterm-readkey-perl,
          libtext-unaccent-perl,


=====================================
etc/exim4/exim-ldap-server-v4.conf
=====================================
@@ -316,7 +316,7 @@ root:
 ldapuser:
   driver = accept
   check_local_user
-  condition = ${if eq {}{${lookup ldap {ldap://LDAPSERVER/LDAPBASE?uid?sub?(uid=${local_part})}}}{no}{yes}}
+  condition = ${if eq {}{${lookup ldap {ldap://LDAPSERVER/LDAPBASE?uid?sub?(uid=${quote_ldap_dn:${local_part}})}}}{no}{yes}}
   cannot_route_message = Recipent ${local_part} unknown.
   retry_use_local_part
   transport = ldap_delivery


=====================================
ldap-bootstrap/debian-edu-router.ldif
=====================================
@@ -0,0 +1,37 @@
+dn: cn=proxy-trusted,ou=netgroup,dc=skole,dc=skolelinux,dc=no
+objectClass: top
+objectClass: nisNetgroup
+cn: proxy-trusted
+description: Completely unfiltered internet access (+ bypasses NAT/T-P-M) - ProxyTrusted{User,Client} - Debian Edu Router Plugin: Content filter
+# This should enable direct unNAT'ted (bypasses transparent-proxy-mode) internet access to all internal servers in the Debian Edu network.
+memberNisNetgroup: server-hosts
+
+dn: cn=proxy-allow,ou=netgroup,dc=skole,dc=skolelinux,dc=no
+objectClass: top
+objectClass: nisNetgroup
+cn: proxy-allow
+description: Generally unfiltered internet access - ProxyAllow{User,Client} - Debian Edu Router Plugin: Content filter
+
+dn: cn=proxy-deny,ou=netgroup,dc=skole,dc=skolelinux,dc=no
+objectClass: top
+objectClass: nisNetgroup
+cn: proxy-deny
+description: Disables internet access completely - ProxyDeny{User,Client} - Debian Edu Router Plugin: Content filter
+
+dn: cn=proxy-blacklist,ou=netgroup,dc=skole,dc=skolelinux,dc=no
+objectClass: top
+objectClass: nisNetgroup
+cn: proxy-blacklist
+description: Allows all but specific blacklisted websites - ProxyBlacklist{User,Client} - Debian Edu Router Plugin: Content filter
+
+dn: cn=proxy-whitelist,ou=netgroup,dc=skole,dc=skolelinux,dc=no
+objectClass: top
+objectClass: nisNetgroup
+cn: proxy-whitelist
+description: Allows nothing but specific whitelisted websites - ProxyWhitelist{User,Client} - Debian Edu Router Plugin: Content filter
+
+dn: cn=proxy-noauth-client,ou=netgroup,dc=skole,dc=skolelinux,dc=no
+objectClass: top
+objectClass: nisNetgroup
+cn: proxy-noauth-client
+description: Fully disable auth. for these clients (BYOD Clients?) - ProxyNoauthClient - Debian Edu Router Plugin: Content filter


=====================================
ldap-tools/ldap-debian-edu-install
=====================================
@@ -282,7 +282,8 @@ EOF
     /etc/ldap/gosa-server.ldif \
     /etc/ldap/ltsp.ldif \
     /etc/ldap/firstuser.ldif \
-    /etc/ldap/krb5.ldif
+    /etc/ldap/krb5.ldif \
+    /etc/ldap/debian-edu-router.ldif
   do
       if cat $ldif | sed -e "s:\$ROOTPWDHASH:$ROOTPWDHASH:" \
 	-e "s/\$MAC/$MAC/" \


=====================================
sbin/debian-edu-pxeinstall
=====================================
@@ -342,7 +342,7 @@ config
 goto start
 
 :shell
-echo Type 'exit' to get the back to the menu
+echo Type 'exit' to get back to the menu
 shell
 goto start
 



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/d816e7acf7d1f680f3dd2bb43c8385a96c9d2b50...b84cbec2c151da42d4872bac7e50116e2f804bbc

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/d816e7acf7d1f680f3dd2bb43c8385a96c9d2b50...b84cbec2c151da42d4872bac7e50116e2f804bbc
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/20250601/1ce81443/attachment-0001.htm>

More information about the debian-edu-commits mailing list