From: Alexander Koch <ipfire@starkstromkonsument.de>
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 [thread overview]
Message-ID: <1555883819-3329-2-git-send-email-ipfire@starkstromkonsument.de> (raw)
In-Reply-To: <1555883819-3329-1-git-send-email-ipfire@starkstromkonsument.de>
[-- Attachment #1: Type: text/plain, Size: 2787 bytes --]
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 <ipfire(a)starkstromkonsument.de>
---
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 <<END
<tr>
<td colspan="4">$Lang::tr{'advproxy wpad view pac'}: <a href="http://$ENV{SERVER_ADDR}:81/wpad.dat" target="_blank">http://$ENV{SERVER_ADDR}:81/wpad.dat</a></td>
</tr>
+<tr>
+ <td colspan="4"> </td>
+</tr>
+<tr>
+ <td colspan="4">$Lang::tr{'advproxy wpad notice'}</td>
+</tr>
</table>
<hr size='1'>
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 <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a> 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 <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>.',
'again' => 'Again:',
'age second' => 'second',
'age seconds' => 'seconds',
--
2.7.4
next prev parent reply other threads:[~2019-04-21 21:56 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-14 10:08 [PATCH] squid / WPAD: Add exception-files for generation of proxy.pac Alexander Koch
2019-04-15 9:43 ` Michael Tremer
2019-04-15 20:12 ` Alexander Koch
2019-04-17 14:08 ` Michael Tremer
2019-04-17 23:54 ` [PATCH 1/2] squid / WPAD: Add GUI for " Alexander Koch
2019-04-17 23:54 ` [PATCH 2/2] apache / WPAD: Add correct MIME type for wpad.dat and proxy.pac Alexander Koch
2019-04-23 15:23 ` Alexander Koch
2019-04-24 10:55 ` Michael Tremer
2019-04-18 10:27 ` [PATCH 1/2] squid / WPAD: Add GUI for exception-files for generation of proxy.pac Michael Tremer
2019-04-18 1:41 ` [PATCH] squid / WPAD: Add " Alexander Koch
2019-04-18 10:33 ` Michael Tremer
2019-04-21 21:56 ` [PATCH 1/2] squid / WPAD: Add GUI for " Alexander Koch
2019-04-21 21:56 ` Alexander Koch [this message]
2019-04-22 8:02 ` Matthias Fischer
2019-04-22 14:06 ` Tom Rymes
2019-04-22 15:10 ` Matthias Fischer
2019-04-22 18:46 ` Michael Tremer
2019-04-23 16:29 ` Matthias Fischer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1555883819-3329-2-git-send-email-ipfire@starkstromkonsument.de \
--to=ipfire@starkstromkonsument.de \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox