From: Alexander Koch Date: Sun, 21 Apr 2019 21:56:59 +0000 (+0200) Subject: squid / WPAD: Add Wiki-Link for required further adjustments to GUI X-Git-Tag: v2.23-core133~199 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=cdc82a993af684a528c7bf2bbfcaf01c983b7783 squid / WPAD: Add Wiki-Link for required further adjustments to GUI 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 Signed-off-by: Michael Tremer --- diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index 55fdc1c35a..91e4fcee83 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 8f8404219c..6468fde30a 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 9a3e8b0132..879cff17d3 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',