diff options
| author | Martin Fuchs <mfuchs77@gmail.com> | 2014-05-08 13:24:22 +0200 |
|---|---|---|
| committer | Martin Fuchs <mfuchs77@gmail.com> | 2014-05-08 13:24:22 +0200 |
| commit | e6fe6bcdd5d7b21c0f42a1177fd504c25c4c714e (patch) | |
| tree | 800e51e0186070dfd31f5b3d72eb246e0dc76579 /config/squid3/33 | |
| parent | 05b0510a62bcc1da9841e981a52212477ad01c0e (diff) | |
| download | pfsense-packages-e6fe6bcdd5d7b21c0f42a1177fd504c25c4c714e.tar.gz pfsense-packages-e6fe6bcdd5d7b21c0f42a1177fd504c25c4c714e.tar.bz2 pfsense-packages-e6fe6bcdd5d7b21c0f42a1177fd504c25c4c714e.zip | |
correct autodiscover settings (wrong hostname) and bump pkg-version
Diffstat (limited to 'config/squid3/33')
| -rwxr-xr-x | config/squid3/33/squid_reverse.inc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/config/squid3/33/squid_reverse.inc b/config/squid3/33/squid_reverse.inc index 08c7b388..064844b6 100755 --- a/config/squid3/33/squid_reverse.inc +++ b/config/squid3/33/squid_reverse.inc @@ -173,8 +173,6 @@ 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"; Obsolete on 3.3 @@ -183,7 +181,12 @@ function squid_resync_reverse() { 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){ |