diff options
| author | Martin Fuchs <mfuchs77@gmail.com> | 2014-05-08 13:24:22 +0200 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2014-05-08 13:29:32 -0300 |
| commit | 6a3d0510d4c2d2bbdbeda22493963781cfdf2b6a (patch) | |
| tree | 33d1825005b5bfaa16c7e4ae77746ed1ddfded2d /config/squid3 | |
| parent | d4dc40d7179a46070a3e0abe37dca130d44ba30a (diff) | |
| download | pfsense-packages-6a3d0510d4c2d2bbdbeda22493963781cfdf2b6a.tar.gz pfsense-packages-6a3d0510d4c2d2bbdbeda22493963781cfdf2b6a.tar.bz2 pfsense-packages-6a3d0510d4c2d2bbdbeda22493963781cfdf2b6a.zip | |
correct autodiscover settings (wrong hostname) and bump pkg-version
Diffstat (limited to 'config/squid3')
| -rw-r--r-- | config/squid3/31/squid_reverse.inc | 11 | ||||
| -rwxr-xr-x | config/squid3/33/squid_reverse.inc | 9 |
2 files changed, 13 insertions, 7 deletions
diff --git a/config/squid3/31/squid_reverse.inc b/config/squid3/31/squid_reverse.inc index eb2d4c73..bfe9cb03 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){ 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){ |