webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 03:33:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

Browse Source
This commit is contained in:
Michael Tremer
2013-06-18 16:49:30 +02:00
parent c050a22433 49c7cb2328
commit eb9f4587df
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/core/70/filelists/files
View File

@@ -5,6 +5,7 @@ etc/rc.d/init.d/squid
usr/local/bin/openvpnctrl usr/local/bin/openvpnctrl
etc/init.d/firewall etc/init.d/firewall
srv/web/ipfire/cgi-bin/ddns.cgi srv/web/ipfire/cgi-bin/ddns.cgi
srv/web/ipfire/cgi-bin/proxy.cgi
usr/lib/squid/errors/tr/ERR_ACCESS_DENIED usr/lib/squid/errors/tr/ERR_ACCESS_DENIED
usr/lib/squid/errors/tr/ERR_ACL_TIME_QUOTA_EXCEEDED usr/lib/squid/errors/tr/ERR_ACL_TIME_QUOTA_EXCEEDED
usr/lib/squid/errors/tr/ERR_AGENT_CONFIGURE usr/lib/squid/errors/tr/ERR_AGENT_CONFIGURE

6
html/cgi-bin/proxy.cgi
View File

@@ -3061,6 +3061,12 @@ icp_port 0
END END
; ;
# Include file with user defined settings.
if (-e "/etc/squid/squid.conf.pre.local") {
print FILE "include /etc/squid/squid.conf.pre.local\n\n";
}
print FILE "http_port $netsettings{'GREEN_ADDRESS'}:$proxysettings{'PROXY_PORT'}"; print FILE "http_port $netsettings{'GREEN_ADDRESS'}:$proxysettings{'PROXY_PORT'}";
if ($proxysettings{'TRANSPARENT'} eq 'on') { print FILE " transparent" } if ($proxysettings{'TRANSPARENT'} eq 'on') { print FILE " transparent" }
if ($proxysettings{'NO_CONNECTION_AUTH'} eq 'on') { print FILE " no-connection-auth" } if ($proxysettings{'NO_CONNECTION_AUTH'} eq 'on') { print FILE " no-connection-auth" }