[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] cf3/cf.squid: Adjust configuration (set http_access allow localnet).

[WolfgangSchweer]

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


Commits:
53e48f4a by Wolfgang Schweer at 2018-09-19T09:58:04Z
cf3/cf.squid: Adjust configuration (set http_access allow localnet).

- - - - -


2 changed files:

- cf3/cf.squid
- debian/changelog


Changes:

=====================================
cf3/cf.squid
=====================================
@@ -49,6 +49,7 @@ vars:
   "default" slist => { "CONFIG=/etc/squid/squid-debian-edu.conf",
                        "SQUID_ARGS=\"-YC -f /etc/squid/squid-debian-edu.conf\"" };
   "proxy"  string => "DHCP_WPAD_PROXY_UPDATE=false";
+  "allow"  string => "http_access allow localnet";
 
 files:
 
@@ -58,6 +59,10 @@ files:
       create => "true",
       edit_line => append_if_no_line("$(default)");
 
+    "/etc/squid/conf.d/debian.conf"
+      create => "true",
+      edit_line => append_if_no_line("$(allow)");
+
   # Disable the automatic proxy configuration on LTSP boot, as the
   # default setup is already correct and not calling
   # wpad-proxy-update shaves 3 seconds from the boot.


=====================================
debian/changelog
=====================================
@@ -4,6 +4,7 @@ debian-edu-config (2.10.37) UNRELEASED; urgency=medium
     - Remove temporary apt configuration. This reverts the modification done in
       d-e-i/base-installer to get back the default apt behaviour for the
       installed system.
+  * cf3/cf.squid: Adjust configuration (set http_access allow localnet).
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Wed, 19 Sep 2018 10:17:02 +0200
 



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/commit/53e48f4a0406d7fac135ccbb4c2e37b71614dd52

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/commit/53e48f4a0406d7fac135ccbb4c2e37b71614dd52
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/20180919/f407e86d/attachment-0001.html>