diff options
| author | Martin Fuchs <mfuchs77@gmail.com> | 2014-06-17 20:07:19 +0200 |
|---|---|---|
| committer | Martin Fuchs <mfuchs77@gmail.com> | 2014-06-17 20:07:19 +0200 |
| commit | a579dfb326bb24443f0d7da0dbcde27a527cb9aa (patch) | |
| tree | e2d40151933e7781df8c5adfd23f9180740f5b05 | |
| parent | a1538e7d5450ca85fa2a2536086e0203b84beef6 (diff) | |
| download | pfsense-packages-a579dfb326bb24443f0d7da0dbcde27a527cb9aa.tar.gz pfsense-packages-a579dfb326bb24443f0d7da0dbcde27a527cb9aa.tar.bz2 pfsense-packages-a579dfb326bb24443f0d7da0dbcde27a527cb9aa.zip | |
add autodiscover url for self-hosted domains
as tested in microsoft-connectivity-analyzer
| -rw-r--r-- | config/squid3/31/squid_reverse.inc | 4 | ||||
| -rwxr-xr-x | config/squid3/33/squid_reverse.inc | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/config/squid3/31/squid_reverse.inc b/config/squid3/31/squid_reverse.inc index 20e16739..d2611c79 100644 --- a/config/squid3/31/squid_reverse.inc +++ b/config/squid3/31/squid_reverse.inc @@ -192,8 +192,10 @@ function squid_resync_reverse() { 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 .= "acl OWA_URI_pfs url_regex -i ^http://{$settings['reverse_external_fqdn']}/AutoDiscover/AutoDiscover.xml\n"; + $conf .= "acl OWA_URI_pfs url_regex -i ^https://{$settings['reverse_external_fqdn']}/AutoDiscover/AutoDiscover.xml\n"; $conf .= "acl OWA_URI_pfs url_regex -i ^http://autodiscover{$reverse_external_domain}/AutoDiscover/AutoDiscover.xml\n"; + $conf .= "acl OWA_URI_pfs url_regex -i ^https://autodiscover{$reverse_external_domain}/AutoDiscover/AutoDiscover.xml\n"; } } //$conf .= "ssl_unclean_shutdown on"; diff --git a/config/squid3/33/squid_reverse.inc b/config/squid3/33/squid_reverse.inc index 5226e819..a6b81c0b 100755 --- a/config/squid3/33/squid_reverse.inc +++ b/config/squid3/33/squid_reverse.inc @@ -191,8 +191,10 @@ function squid_resync_reverse() { 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 .= "acl OWA_URI_pfs url_regex -i ^http://{$settings['reverse_external_fqdn']}/AutoDiscover/AutoDiscover.xml\n"; + $conf .= "acl OWA_URI_pfs url_regex -i ^https://{$settings['reverse_external_fqdn']}/AutoDiscover/AutoDiscover.xml\n"; $conf .= "acl OWA_URI_pfs url_regex -i ^http://autodiscover{$reverse_external_domain}/AutoDiscover/AutoDiscover.xml\n"; + $conf .= "acl OWA_URI_pfs url_regex -i ^https://autodiscover{$reverse_external_domain}/AutoDiscover/AutoDiscover.xml\n"; } } //$conf .= "ssl_unclean_shutdown on"; |