From 20eed5536e0e961e9a6b157b60b950e1491dee58 Mon Sep 17 00:00:00 2001
From: Martin Fuchs <martin.fuchs@trendchiller.com>
Date: Fri, 30 Sep 2011 15:23:05 +0200
Subject: multi-fqdn for vhost

---
 config/squid-reverse/squid.inc         | 7 +++++--
 config/squid-reverse/squid_reverse.xml | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'config/squid-reverse')

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>
-- 
cgit v1.2.3