aboutsummaryrefslogtreecommitdiffstats
path: root/config/squid3/31
diff options
context:
space:
mode:
Diffstat (limited to 'config/squid3/31')
-rw-r--r--config/squid3/31/squid.xml44
-rw-r--r--config/squid3/31/squid_ng.inc2
-rw-r--r--config/squid3/31/squid_ng.xml16
-rw-r--r--config/squid3/31/squid_reverse.inc11
4 files changed, 38 insertions, 35 deletions
diff --git a/config/squid3/31/squid.xml b/config/squid3/31/squid.xml
index aa76c0f1..53293acd 100644
--- a/config/squid3/31/squid.xml
+++ b/config/squid3/31/squid.xml
@@ -111,112 +111,112 @@
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<chmod>0755</chmod>
- <item>http://www.pfsense.org/packages/config/squid3/31/squid.inc</item>
+ <item>https://packages.pfsense.org/packages/config/squid3/31/squid.inc</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<chmod>0755</chmod>
- <item>http://www.pfsense.org/packages/config/squid3/31/squid_reverse_general.xml</item>
+ <item>https://packages.pfsense.org/packages/config/squid3/31/squid_reverse_general.xml</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<chmod>0755</chmod>
- <item>http://www.pfsense.org/packages/config/squid3/31/squid_reverse_peer.xml</item>
+ <item>https://packages.pfsense.org/packages/config/squid3/31/squid_reverse_peer.xml</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<chmod>0755</chmod>
- <item>http://www.pfsense.org/packages/config/squid3/31/squid_reverse_uri.xml</item>
+ <item>https://packages.pfsense.org/packages/config/squid3/31/squid_reverse_uri.xml</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<chmod>0755</chmod>
- <item>http://www.pfsense.org/packages/config/squid3/31/squid_reverse_sync.xml</item>
+ <item>https://packages.pfsense.org/packages/config/squid3/31/squid_reverse_sync.xml</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<chmod>0755</chmod>
- <item>http://www.pfsense.org/packages/config/squid3/31/squid_sync.xml</item>
+ <item>https://packages.pfsense.org/packages/config/squid3/31/squid_sync.xml</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<chmod>0755</chmod>
- <item>http://www.pfsense.org/packages/config/squid3/31/squid_cache.xml</item>
+ <item>https://packages.pfsense.org/packages/config/squid3/31/squid_cache.xml</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<chmod>0755</chmod>
- <item>http://www.pfsense.org/packages/config/squid3/31/squid_nac.xml</item>
+ <item>https://packages.pfsense.org/packages/config/squid3/31/squid_nac.xml</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<chmod>0755</chmod>
- <item>http://www.pfsense.org/packages/config/squid3/31/squid_ng.xml</item>
+ <item>https://packages.pfsense.org/packages/config/squid3/31/squid_ng.xml</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<chmod>0755</chmod>
- <item>http://www.pfsense.org/packages/config/squid3/31/squid_ng.inc</item>
+ <item>https://packages.pfsense.org/packages/config/squid3/31/squid_ng.inc</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<chmod>0755</chmod>
- <item>http://www.pfsense.org/packages/config/squid3/31/squid_traffic.xml</item>
+ <item>https://packages.pfsense.org/packages/config/squid3/31/squid_traffic.xml</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<chmod>0755</chmod>
- <item>http://www.pfsense.org/packages/config/squid3/31/squid_upstream.xml</item>
+ <item>https://packages.pfsense.org/packages/config/squid3/31/squid_upstream.xml</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<chmod>0755</chmod>
- <item>http://www.pfsense.org/packages/config/squid3/31/squid_reverse.xml</item>
+ <item>https://packages.pfsense.org/packages/config/squid3/31/squid_reverse.xml</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<chmod>0755</chmod>
- <item>http://www.pfsense.org/packages/config/squid3/31/squid_reverse.inc</item>
+ <item>https://packages.pfsense.org/packages/config/squid3/31/squid_reverse.inc</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<chmod>0755</chmod>
- <item>http://www.pfsense.org/packages/config/squid3/31/squid_auth.xml</item>
+ <item>https://packages.pfsense.org/packages/config/squid3/31/squid_auth.xml</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<chmod>0755</chmod>
- <item>http://www.pfsense.org/packages/config/squid3/31/squid_users.xml</item>
+ <item>https://packages.pfsense.org/packages/config/squid3/31/squid_users.xml</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<chmod>0755</chmod>
- <item>http://www.pfsense.org/packages/config/squid3/31/sqpmon.sh</item>
+ <item>https://packages.pfsense.org/packages/config/squid3/31/sqpmon.sh</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<chmod>0755</chmod>
- <item>http://www.pfsense.org/packages/config/squid3/31/swapstate_check.php</item>
+ <item>https://packages.pfsense.org/packages/config/squid3/31/swapstate_check.php</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<chmod>0755</chmod>
- <item>http://www.pfsense.org/packages/config/squid3/31/squid_reverse_redir.xml</item>
+ <item>https://packages.pfsense.org/packages/config/squid3/31/squid_reverse_redir.xml</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/www/</prefix>
<chmod>0755</chmod>
- <item>http://www.pfsense.org/packages/config/squid3/31/squid_monitor.php</item>
+ <item>https://packages.pfsense.org/packages/config/squid3/31/squid_monitor.php</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/www/</prefix>
<chmod>0755</chmod>
- <item>http://www.pfsense.org/packages/config/squid3/31/squid_monitor_data.php</item>
+ <item>https://packages.pfsense.org/packages/config/squid3/31/squid_monitor_data.php</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/www/</prefix>
<chmod>0755</chmod>
- <item>http://www.pfsense.org/packages/config/squid3/31/squid_log_parser.php</item>
+ <item>https://packages.pfsense.org/packages/config/squid3/31/squid_log_parser.php</item>
</additional_files_needed>
<fields>
diff --git a/config/squid3/31/squid_ng.inc b/config/squid3/31/squid_ng.inc
index 0e1e0515..3b9ef405 100644
--- a/config/squid3/31/squid_ng.inc
+++ b/config/squid3/31/squid_ng.inc
@@ -803,7 +803,7 @@ function squid3_custom_php_install_command() {
touch("/tmp/squid3_custom_php_install_command");
/* make sure this all exists, see:
- * http://forum.pfsense.org/index.php?topic=23.msg2391#msg2391
+ * https://forum.pfsense.org/index.php?topic=23.msg2391#msg2391
*/
update_output_window("Setting up Squid environment...");
mwexec("mkdir -p /var/squid");
diff --git a/config/squid3/31/squid_ng.xml b/config/squid3/31/squid_ng.xml
index 142536d6..b96b4eb2 100644
--- a/config/squid3/31/squid_ng.xml
+++ b/config/squid3/31/squid_ng.xml
@@ -102,42 +102,42 @@
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<chmod>0755</chmod>
- <item>http://www.pfsense.com/packages/config/squid/squid_cache.xml</item>
+ <item>https://packages.pfsense.org/packages/config/squid/squid_cache.xml</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<chmod>0755</chmod>
- <item>http://www.pfsense.com/packages/config/squid/squid_nac.xml</item>
+ <item>https://packages.pfsense.org/packages/config/squid/squid_nac.xml</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<chmod>0755</chmod>
- <item>http://www.pfsense.com/packages/config/squid/squid_ng.inc</item>
+ <item>https://packages.pfsense.org/packages/config/squid/squid_ng.inc</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<chmod>0755</chmod>
- <item>http://www.pfsense.com/packages/config/squid/squid_traffic.xml</item>
+ <item>https://packages.pfsense.org/packages/config/squid/squid_traffic.xml</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<chmod>0755</chmod>
- <item>http://www.pfsense.com/packages/config/squid/squid_upstream.xml</item>
+ <item>https://packages.pfsense.org/packages/config/squid/squid_upstream.xml</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<chmod>0755</chmod>
- <item>http://www.pfsense.com/packages/config/squid/squid_auth.xml</item>
+ <item>https://packages.pfsense.org/packages/config/squid/squid_auth.xml</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<chmod>0755</chmod>
- <item>http://www.pfsense.com/packages/config/squid/squid_auth.inc</item>
+ <item>https://packages.pfsense.org/packages/config/squid/squid_auth.inc</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<chmod>0755</chmod>
- <item>http://www.pfsense.com/packages/config/squid/squid_extauth.xml</item>
+ <item>https://packages.pfsense.org/packages/config/squid/squid_extauth.xml</item>
</additional_files_needed>
<fields>
<field>
diff --git a/config/squid3/31/squid_reverse.inc b/config/squid3/31/squid_reverse.inc
index eb2d4c73..993508aa 100644
--- a/config/squid3/31/squid_reverse.inc
+++ b/config/squid3/31/squid_reverse.inc
@@ -170,17 +170,20 @@ function squid_resync_reverse() {
array_push($owa_dirs,'Microsoft-Server-ActiveSync');
if($settings['reverse_owa_rpchttp'])
array_push($owa_dirs,'rpc/rpcproxy.dll','rpcwithcert/rpcproxy.dll');
- if($settings['reverse_owa_autodiscover'])
- array_push($owa_dirs,'autodiscover');
if($settings['reverse_owa_webservice']){
array_push($owa_dirs,'EWS');
$conf .= "ignore_expect_100 on\n";
- }
+ }
}
if (is_array($owa_dirs))
foreach ($owa_dirs as $owa_dir)
$conf .= "acl OWA_URI_pfs url_regex -i ^https://{$settings['reverse_external_fqdn']}/$owa_dir.*$\n";
- }
+
+ if (($settings['reverse_owa'] == 'on') && (!empty($settings['reverse_owa_ip'])) && ($settings['reverse_owa_autodiscover'] == 'on')) {
+ $reverse_external_domain = strstr($settings['reverse_external_fqdn'], '.');
+ $conf .= "acl OWA_URI_pfs url_regex -i ^https://autodiscover{$reverse_external_domain}/AutoDiscover/AutoDiscover.xml\n";
+ }
+ }
//$conf .= "ssl_unclean_shutdown on";
if (is_array($reverse_maps))
foreach ($reverse_maps as $rm){
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 21:31:02 +0000