aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorMartin Fuchs <martin.fuchs@trendchiller.com>2011-09-30 15:23:05 +0200
committerMartin Fuchs <martin.fuchs@trendchiller.com>2011-09-30 15:23:05 +0200
commit20eed5536e0e961e9a6b157b60b950e1491dee58 (patch)
tree28f7b0de6788ce58c77a08e7582a5ae7dd45c456 /config
parent8d2bcb1c7668ce8533f87289795646e47b90cb4b (diff)
downloadpfsense-packages-20eed5536e0e961e9a6b157b60b950e1491dee58.tar.gz
pfsense-packages-20eed5536e0e961e9a6b157b60b950e1491dee58.tar.bz2
pfsense-packages-20eed5536e0e961e9a6b157b60b950e1491dee58.zip
multi-fqdn for vhost
Diffstat (limited to 'config')
-rw-r--r--config/squid-reverse/squid.inc7
-rw-r--r--config/squid-reverse/squid_reverse.xml2
2 files changed, 6 insertions, 3 deletions
diff --git a/config/squid-reverse/squid.inc b/config/squid-reverse/squid.inc
index 7e6acd3a..5877ab58 100644
--- a/config/squid-reverse/squid.inc
+++ b/config/squid-reverse/squid.inc
@@ -1040,8 +1040,11 @@ $conf .= "# -= TESTING AREA =-\n";
foreach ($defs as $def) {
$cfg = explode(";",($def));
if (($cfg[0]) != '' && ($cfg[1]) != ''){
- $conf .= "# acl {$cfg[0]} url_regex -i {$settings['reverse_external_fqdn']} {$cfg[1]}.*$\n";
-// if($cfg[3] == 'HTTPS')
+ if($cfg[2] != '')
+ $conf .= "# acl {$cfg[0]} url_regex -i {$cfg[2]}/{$cfg[1]}.*$\n";
+ if($cfg[2] == '')
+ $conf .= "# acl {$cfg[0]} url_regex -i {$settings['reverse_external_fqdn']}/{$cfg[1]}.*$\n";
+// if($cfg[2] == 'HTTPS')
// $conf .= "login=PASS ssl sslflags=DONT_VERIFY_PEER front-end-https=auto ";
// $conf .= "name={$cfg[0]}\n";
}}}
diff --git a/config/squid-reverse/squid_reverse.xml b/config/squid-reverse/squid_reverse.xml
index 8958fa64..8f7686f1 100644
--- a/config/squid-reverse/squid_reverse.xml
+++ b/config/squid-reverse/squid_reverse.xml
@@ -220,7 +220,7 @@
<field>
<fielddescr>&lt;b&gt;URI definitions&lt;/b&gt; &lt;br&gt;published URIs</fielddescr>
<fieldname>revrse_uri</fieldname>
- <description>Enter each reverse acl definition on a new line. Directives have to be separated by a semicolon(;).&lt;br&gt;syntax: [group the uri belongs to];[URI to publish] (a group can contain multiple URIs) &lt;br&gt;example: URI1;public &lt;br&gt;&lt;i&gt;WRONG SYNTAX USAGE WILL RESULT IN SQUID NOT STARTING&lt;/i&gt;
+ <description>Enter each reverse acl definition on a new line. Directives have to be separated by a semicolon(;).&lt;br&gt;syntax: [group the uri belongs to];[URI to publish](;[vhost fqdn]) &lt;br&gt;(a group can contain multiple URIs, without vhost fqdn the external fqdn is used, you also can specity http:// or https://) &lt;br&gt;example: URI1;public;server.pfsense.org. &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>