From patchwork Mon Apr 22 07:56:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Koch X-Patchwork-Id: 2206 Return-Path: Received: from mail01.ipfire.org (mail01.i.ipfire.org [172.28.1.200]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail01.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web07.i.ipfire.org (Postfix) with ESMTPS id EEC3385BD81 for ; Sun, 21 Apr 2019 22:57:16 +0100 (BST) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 44nNpz1mPyz5H9P6; Sun, 21 Apr 2019 22:57:15 +0100 (BST) Received: from nx101.node02.secure-mailgate.com (nx101.node02.secure-mailgate.com [192.162.87.101]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPS id 44nNpv5mgwz5H9Nc for ; Sun, 21 Apr 2019 22:57:11 +0100 (BST) Received: from dehamd003.servertools24.de ([31.47.254.18]) by node02.secure-mailgate.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89) (envelope-from ) id 1hIKSN-0005cI-A0 for development@lists.ipfire.org; Sun, 21 Apr 2019 23:57:04 +0200 Received: from balthasar.starkstromlahn.spdns.org (dslb-002-205-032-234.002.205.pools.vodafone-ip.de [2.205.32.234]) by dehamd003.servertools24.de (Postfix) with ESMTPSA id E5D9382355 for ; Sun, 21 Apr 2019 23:57:01 +0200 (CEST) From: Alexander Koch To: development@lists.ipfire.org Subject: [PATCH 2/2] squid / WPAD: Add Wiki-Link for required further adjustments to GUI Date: Sun, 21 Apr 2019 23:56:59 +0200 Message-Id: <1555883819-3329-2-git-send-email-ipfire@starkstromkonsument.de> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1555883819-3329-1-git-send-email-ipfire@starkstromkonsument.de> References: <1555883819-3329-1-git-send-email-ipfire@starkstromkonsument.de> X-Originating-IP: 31.47.254.18 X-SecureMailgate-Domain: dehamd003.servertools24.de X-SecureMailgate-Username: 31.47.254.18 X-SecureMailgate-Outgoing-Class: ham X-SecureMailgate-Outgoing-Evidence: Combined (0.05) X-Recommended-Action: accept X-Filter-ID: EX5BVjFpneJeBchSMxfU5rafN/YSiN1rCL5cHDpHLM9602E9L7XzfQH6nu9C/Fh9KJzpNe6xgvOx q3u0UDjvO234slfrnEdiMqZNFIl3KV30wqEzzsz0qey7Lab92ZzcVTGbEWWnE2yTxqfzAQugcTwr yRxzt9ttx0guxdrRRPxIeZjZv1oz6oWKgngYgisMFP/fMVP0svmpWqdKA4I3N3DrsgLoQIlol112 md4PmZ3JlwazEuJ5FLeAveAcO7l0w+pJdu/U5y6mAHsHsNznwP0sNOmRi6cQXeybw4h5I237Nx2K MWdgPAi++APAaUY2H/cuh5evaj1lUzaVjWgVraO5TPqzGal/PlyCuaPMa+bGc8PaqZZ/FzEG53Yo 1Az82WYSex+Yt07uCbJsusiJ1enFl6U7B/q9vr26RhU4BBU/xuIZVofF0iEmlfZIX9+tP9OlDLyR N9GjtiXFVLi3Vl19D65Nxn6Sz8wAkuPxgFgLMK9HC+pUQBAyR03+Yzd8UhwxKCq1wptT0tr4AeII UH2+5gx4OhewwkMP0JkVbYMdd65ri6y7K51mXtklaaDlrSOIPpeqwlm2NDGXIJ2x7OHYlJMxQPrm gMtcg8AzxfsiDo+IpU12FumWzopltXdKG19PQ//zTdwlaOcjMVVgrf1PeOWddjCtOmdRMrZN8jgM yeNRq1jbE+1JbC4bXhPaBnH7tqS9e5bS4qA/jFxLRoV9VXyPpwhrSnOhfpMqWhrxRIfd0bAuQbjq t+XCpWwA0Q8kyfrtwrpahI8V1plAkVpK6jIxoNClGn1CeW0psfxM3nwqXdbbSto7IwNqfR3H8ZZD w6MG3E9U62qnI+GE+vFq5rhWpcEtzkb8VVIzoQ3rjuU3A3io6xJmD59iFVkbj3Ez2xu8SRHhFCYw xJ6gkcv/S4qaprz9Djv6d2Y4kBdsIH8EF3joBheiindVvWjMwqLzoKXgT5Up7fvpQRUuERvipbQ5 EcjyCGH1YtofXcIDWDyg/Q/09Ieu7aO1pJGxeyyFY8GlmzRmIAOnS+GEX99IXHPnR/WBAxQU9Pct nno= X-Report-Abuse-To: spam@node01.secure-mailgate.com Authentication-Results: mail01.ipfire.org; dkim=none; dmarc=none; spf=pass (mail01.ipfire.org: domain of ipfire@starkstromkonsument.de designates 192.162.87.101 as permitted sender) smtp.mailfrom=ipfire@starkstromkonsument.de X-Rspamd-Queue-Id: 44nNpv5mgwz5H9Nc X-Spamd-Result: default: False [-3.67 / 11.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; HAS_XOIP(0.00)[]; FROM_HAS_DN(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:192.162.87.0/24]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[development@lists.ipfire.org]; TO_DN_NONE(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; RCVD_COUNT_THREE(0.00)[3]; DMARC_NA(0.00)[starkstromkonsument.de]; MX_GOOD(-0.01)[mail.starkstromkonsument.de]; RCVD_IN_DNSWL_NONE(0.00)[101.87.162.192.list.dnswl.org : 127.0.5.0]; MID_CONTAINS_FROM(1.00)[]; IP_SCORE(-1.36)[ipnet: 192.162.84.0/22(-3.76), asn: 45031(-2.96), country: DE(-0.09)]; RECEIVED_SPAMHAUS_PBL(0.00)[234.32.205.2.zen.spamhaus.org : 127.0.0.11]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:45031, ipnet:192.162.84.0/22, country:DE]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-3.00)[100.00%]; FROM_EQ_ENVFROM(0.00)[] X-Rspamd-Server: mail01.i.ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This patch adds a notice with a link to the Wiki-page https://wiki.ipfire.org/configuration/network/proxy/extend/wpad to the new WebGUI-Setion to make the user aware of the fact, that WPAD will only work correctly if he makes further adjustments: - Add DHCP-Options for WPAD via DHCP - Add HOST-Entries to DNS and Apache-vhost or haproxy-frontend/backend or firewall-redirect for WPAD via DNS These additional options depend on the users environment and can not be shipped by default as they might break the users setups. Note: The translations are only done for "en" and "de" yet! Signed-off-by: Alexander Koch --- html/cgi-bin/proxy.cgi | 6 ++++++ langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + 3 files changed, 8 insertions(+) diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index 55fdc1c..91e4fce 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -1365,6 +1365,12 @@ print < $Lang::tr{'advproxy wpad view pac'}: http://$ENV{SERVER_ADDR}:81/wpad.dat + +   + + + $Lang::tr{'advproxy wpad notice'} +
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 8f84042..6468fde 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -403,6 +403,7 @@ 'advproxy wpad example dst_noproxy_ip' => 'z.B. 192.168.2.0/255.255.255.0', 'advproxy errmsg wpad invalid ip or mask' => 'WPAD: Ungültige IP oder Subnetz für ausgenommenes IP-Subnetz', 'advproxy wpad view pac' => 'PAC-Datei aufrufen', +'advproxy wpad notice' => 'Hinweis: Damit WPAD / PAC korrekt funktioniert, sind weitere Anpassungen erforderlich. Bitte in das Wiki schauen.', 'again' => 'Wiederholung:', 'age second' => 'Sekunde', 'age seconds' => 'Sekunden', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 9a3e8b0..879cff1 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -404,6 +404,7 @@ 'advproxy wpad example dst_noproxy_ip' => 'e.g. 192.168.2.0/255.255.255.0', 'advproxy errmsg wpad invalid ip or mask' => 'WPAD: Invalid IP or subnet for excluded IP-subnet', 'advproxy wpad view pac' => 'Open PAC-File', +'advproxy wpad notice' => 'Notice: For WPAD / PAC to work properly, furtcher changes need to be made. Please see the Wiki.', 'again' => 'Again:', 'age second' => 'second', 'age seconds' => 'seconds',