Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

polipo updates:

 * LogFacility auf "daemon" geändert. 
 * WebIF akzeptiert nun mehrere IPs/Netze (allowedClients). 
 * WebIF "Andere Optionen" geändert auf Textfeld mit einer Option pro Zeile
by SilentBob
(closes #2210)

git-svn-id: file:///var/svn/freetz/trunk@11118 149334a1-2f27-0410-a3b9-fc62619ac1e6
  • Loading branch information...
commit 4c0cb18882a8b245914a3c278f3ffddaecbe5d37 1 parent 0148f06
cuma authored
View
11 make/polipo/files/root/etc/default.polipo/polipo_conf
@@ -3,13 +3,13 @@
. /mod/etc/conf/polipo.cfg
echo "daemonise = true"
-
+echo "logFacility = daemon"
[ -n "${POLIPO_PORT// /}" ] && echo "proxyPort = $POLIPO_PORT"
-[ -n "${POLIPO_IP// /}" ] && echo "proxyAddress = \"$POLIPO_IP\""
+[ -n "${POLIPO_IP// /}" ] && echo "proxyAddress = $POLIPO_IP"
-[ -n "${POLIPO_CLIENTS// /}" ] && echo "allowedClients = \"$POLIPO_CLIENTS\""
+[ -n "${POLIPO_CLIENTS// /}" ] && echo "allowedClients = $POLIPO_CLIENTS"
[ -n "$POLIPO_DISABLESERVERSLIST" ] && echo "disableServersList = $POLIPO_DISABLESERVERSLIST"
@@ -21,6 +21,7 @@ echo "daemonise = true"
# optional settings
if [ -n "$POLIPO_OPTIONS" ]; then
- echo "$POLIPO_OPTIONS" | sed 's/[[:space:]]*;[[:space:]]*/\n/g'
+ echo "$POLIPO_OPTIONS" | grep -v "^#" | while read -r option; do
+ [ -n "$option" ] && echo "$option"
+ done
fi
-
View
8 make/polipo/files/root/usr/lib/cgi-bin/polipo.cgi
@@ -26,7 +26,7 @@ cat << EOF
<i>Proxy-IP:</i> &nbsp; <input type="text" name="ip" size="20" maxlength="20" value="$(html "$POLIPO_IP")"> &nbsp; &nbsp; &nbsp;
<i>Proxy-Port:</i> &nbsp; <input type="text" name="port" size="10" maxlength="10" value="$(html "$POLIPO_PORT")">
-<h2>Optional: $(lang de:"Liste zu&auml;ssiger Clients" en:"List of allowed clients"):</h2>
+<h2>Optional: $(lang de:"Liste zu&auml;ssiger Clients (mit ',' getrennt)" en:"List of allowed clients (separated by ',')"):</h2>
<input type="text" name="clients" size="68" maxlength="200" value="$(html "$POLIPO_CLIENTS")">
<table width="100%" style="table-layout:fixed">
@@ -38,10 +38,8 @@ cat << EOF
</tr>
</table>
-
-<h2>$(lang de:"Andere Optionen (mit ';' getrennt)" en:"Additional options (separated by ';')"):</h2>
-<p><input type="text" name="options" size="68" maxlength="255" value="$(html "$POLIPO_OPTIONS")"></p>
-
+<h2>$(lang de:"Andere Optionen (eine pro Zeile)" en:"Additional options (one per line)"):</h2>
+<p><textarea name="options" rows="5" cols="65">$(html "$POLIPO_OPTIONS")</textarea></p>
EOF
sec_end
Please sign in to comment.
Something went wrong with that request. Please try again.