From mboxrd@z Thu Jan 1 00:00:00 1970 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> In-Reply-To: <1555883819-3329-1-git-send-email-ipfire@starkstromkonsument.de> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2032144872061971638==" List-Id: --===============2032144872061971638== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 furth= er adjustments: - Add DHCP-Options for WPAD via DHCP - Add HOST-Entries to DNS and Apache-vhost or haproxy-frontend/backend or fir= ewall-redirect for WPAD via DNS These additional options depend on the users environment and can not be shipp= ed 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/wp= ad.dat + +   + + + $Lang::tr{'advproxy wpad notice'} + =20
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' =3D> 'z.B. 192.168.2.0/255.255.255.0', 'advproxy errmsg wpad invalid ip or mask' =3D> 'WPAD: Ungültige IP oder= Subnetz für ausgenommenes IP-Subnetz', 'advproxy wpad view pac' =3D> 'PAC-Datei aufrufen', +'advproxy wpad notice' =3D> 'Hinweis: Damit WPAD / PAC korrekt funktioniert,= sind weitere Anpassungen erforderlich. Bitte in das Wiki schauen.', 'again' =3D> 'Wiederholung:', 'age second' =3D> 'Sekunde', 'age seconds' =3D> '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' =3D> 'e.g. 192.168.2.0/255.255.255.0', 'advproxy errmsg wpad invalid ip or mask' =3D> 'WPAD: Invalid IP or subnet f= or excluded IP-subnet', 'advproxy wpad view pac' =3D> 'Open PAC-File', +'advproxy wpad notice' =3D> 'Notice: For WPAD / PAC to work properly, furtch= er changes need to be made. Please see the Wiki.', 'again' =3D> 'Again:', 'age second' =3D> 'second', 'age seconds' =3D> 'seconds', --=20 2.7.4 --===============2032144872061971638==--