aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorMartin Fuchs <martin.fuchs@trendchiller.com>2011-09-30 13:50:20 +0200
committerMartin Fuchs <martin.fuchs@trendchiller.com>2011-09-30 13:50:20 +0200
commitfccac1d03c0ae59a36845eb9b30a9ad45f7f7738 (patch)
treee5ef2fe8d92e50e9adfe655aafc7067062a6d70b /config
parentc828ba8054534c082d5cf226dc987ed451a457c6 (diff)
downloadpfsense-packages-fccac1d03c0ae59a36845eb9b30a9ad45f7f7738.tar.gz
pfsense-packages-fccac1d03c0ae59a36845eb9b30a9ad45f7f7738.tar.bz2
pfsense-packages-fccac1d03c0ae59a36845eb9b30a9ad45f7f7738.zip
peers work
Diffstat (limited to 'config')
-rw-r--r--config/squid-reverse/squid.inc28
-rw-r--r--config/squid-reverse/squid_reverse.xml3
2 files changed, 27 insertions, 4 deletions
diff --git a/config/squid-reverse/squid.inc b/config/squid-reverse/squid.inc
index 1c68045f..55e2facd 100644
--- a/config/squid-reverse/squid.inc
+++ b/config/squid-reverse/squid.inc
@@ -1005,6 +1005,17 @@ function squid_resync_reverse() {
}
//PEERS
if (($settings['reverse_owa'] == 'on') && (!empty($settings['reverse_owa_ip']))) $conf .= "cache_peer {$settings['reverse_owa_ip']} parent 443 0 proxy-only no-query originserver login=PASS ssl sslflags=DONT_VERIFY_PEER front-end-https=auto name=OWA_HOST_pfs\n";
+
+ $contents = base64_decode($settings['reverse_cache_peer']);
+ if(!empty($contents)) {
+ $defs = explode("\r\n", ($contents));
+ foreach ($defs as $def) {
+ $cfg = explode(";",($def));
+ $conf .= "cache_peer {$cfg[1]} parent {$cfg[2]} 0 proxy-only no-query originserver ";
+ if($cfg[3] == 'HTTPS')
+ $conf .= "login=PASS ssl sslflags=DONT_VERIFY_PEER front-end-https=auto ";
+ $conf .= "name={$cfg[0]}\n";
+ }}
//ACLs
if (($settings['reverse_owa'] == 'on') && (!empty($settings['reverse_owa_ip']))) {
@@ -1028,10 +1039,23 @@ function squid_resync_reverse() {
$conf .= "never_direct allow OWA_URI_pfs\n";
$conf .= "http_access allow OWA_URI_pfs\n";
}
-
+
+/*
+ $contents = base64_decode($settings['reverse_cache_peer']);
+ if(!empty($contents)) {
+ $defs = explode("\r\n", ($contents));
+ foreach ($defs as $def) {
+ $cfg = explode(";",($def));
+ $conf .= "# cache_peer {$cfg[1]} parent {$cfg[2]} 0 proxy-only no-query originserver ";
+ if($cfg[3] == 'HTTPS')
+ $conf .= "login=PASS ssl sslflags=DONT_VERIFY_PEER front-end-https=auto ";
+ $conf .= "name={$cfg[0]}\n";
+ }}
+*/
+
+ $conf .= "\n";
if (!empty($settings['deny_info_tcp_reset'])) $conf .= "deny_info TCP_RESET all\n";
-
return $conf;
}
diff --git a/config/squid-reverse/squid_reverse.xml b/config/squid-reverse/squid_reverse.xml
index 61aa4aae..8958fa64 100644
--- a/config/squid-reverse/squid_reverse.xml
+++ b/config/squid-reverse/squid_reverse.xml
@@ -206,12 +206,11 @@
<type>checkbox</type>
<enablefields>extension_methods</enablefields>
</field>
-
<field>
<fielddescr>&lt;b&gt;peer definitions&lt;/b&gt; &lt;br&gt;publishing hosts</fielddescr>
<fieldname>reverse_cache_peer</fieldname>
- <description>Enter each peer definition on a new line. Directives have to be separated by a semicolon(;). &lt;br&gt;syntax: [peer alias];[internal ip address]:[port];[HTTP / HTTPS] &lt;br&gt;example: HOST1;192.168.0.1:80;HTTP &lt;br&gt;&lt;i&gt;WRONG SYNTAX USAGE WILL RESULT IN SQUID NOT STARTING&lt;/i&gt;
+ <description>Enter each peer definition on a new line. Directives have to be separated by a semicolon(;). &lt;br&gt;syntax: [peer alias];[internal ip address];[port];[HTTP / HTTPS] &lt;br&gt;example: HOST1;192.168.0.1;80;HTTP &lt;br&gt;&lt;i&gt;WRONG SYNTAX USAGE WILL RESULT IN SQUID NOT STARTING&lt;/i&gt;
</description>
<type>textarea</type>
<cols>60</cols>