| 1 |
diff -Nur smeserver-horde-1.0.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30WebmailAliases smeserver-horde-1.0.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30WebmailAliases |
| 2 |
--- smeserver-horde-1.0.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30WebmailAliases 2016-06-16 18:26:45.000000000 -0400 |
| 3 |
+++ smeserver-horde-1.0.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30WebmailAliases 2020-06-27 14:47:23.150000000 -0400 |
| 4 |
@@ -14,9 +14,10 @@ |
| 5 |
|
| 6 |
foreach $place ('webmail','horde') |
| 7 |
{ |
| 8 |
- if (($port eq "80") && ($haveSSL eq 'yes') && ($webmailAccessType eq 'SSL')) |
| 9 |
+ if (($port eq "$httpPort") && ($haveSSL eq 'yes') && ($webmailAccessType eq 'SSL')) |
| 10 |
{ |
| 11 |
- $OUT .= " RewriteRule ^/$place(/.*|\$) https://%{HTTP_HOST}/$place\$1 [L,R]\n"; |
| 12 |
+ my $portspec = ($httpsPort eq 443) ? "" : ":$httpsPort"; |
| 13 |
+ $OUT .= " RewriteRule ^/$place(/.*|\$) https://%{HTTP_HOST}${portspec}/$place\$1 [L,R]\n"; |
| 14 |
} else { |
| 15 |
$OUT .= " Alias /$place $dirs{$place}\n"; |
| 16 |
} |
| 17 |
diff -Nur smeserver-horde-1.0.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/35HordeActivesyncAliases smeserver-horde-1.0.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/35HordeActivesyncAliases |
| 18 |
--- smeserver-horde-1.0.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/35HordeActivesyncAliases 2016-06-16 15:10:56.000000000 -0400 |
| 19 |
+++ smeserver-horde-1.0.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/35HordeActivesyncAliases 2020-06-27 14:47:23.153000000 -0400 |
| 20 |
@@ -7,12 +7,13 @@ |
| 21 |
return " # ActiveSync is disabled" |
| 22 |
unless $webmailStatus eq 'enabled' && $syncStatus eq 'enabled'; |
| 23 |
|
| 24 |
- if (($port eq "80") && ($syncStatus eq 'enabled') && ($haveSSL eq 'yes') && ($webmailAccessType eq 'SSL')) |
| 25 |
+ if (($port eq "$httpPort") && ($syncStatus eq 'enabled') && ($haveSSL eq 'yes') && ($webmailAccessType eq 'SSL')) |
| 26 |
{ |
| 27 |
- $OUT .= " RewriteRule ^/Microsoft-Server-ActiveSync(/.*|\$) https://%{HTTP_HOST}/webmail/rpc.php\$1 [L,R]\n"; |
| 28 |
- $OUT .= " RewriteRule ^/autodiscover/autodiscover.xml(/.*|\$) https://%{HTTP_HOST}/webmail/rpc.php\$1 [L,R]\n"; |
| 29 |
- $OUT .= " RewriteRule ^/Autodiscover/Autodiscover.xml(/.*|\$) https://%{HTTP_HOST}/webmail/rpc.php\$1 [L,R]\n"; |
| 30 |
- $OUT .= " RewriteRule ^/AutoDiscover/AutoDiscover.xml(/.*|\$) https://%{HTTP_HOST}/webmail/rpc.php\$1 [L,R]\n"; |
| 31 |
+ my $portspec = ($httpsPort eq 443) ? "" : ":$httpsPort"; |
| 32 |
+ $OUT .= " RewriteRule ^/Microsoft-Server-ActiveSync(/.*|\$) https://%{HTTP_HOST}${portspec}/webmail/rpc.php\$1 [L,R]\n"; |
| 33 |
+ $OUT .= " RewriteRule ^/autodiscover/autodiscover.xml(/.*|\$) https://%{HTTP_HOST}${portspec}/webmail/rpc.php\$1 [L,R]\n"; |
| 34 |
+ $OUT .= " RewriteRule ^/Autodiscover/Autodiscover.xml(/.*|\$) https://%{HTTP_HOST}${portspec}/webmail/rpc.php\$1 [L,R]\n"; |
| 35 |
+ $OUT .= " RewriteRule ^/AutoDiscover/AutoDiscover.xml(/.*|\$) https://%{HTTP_HOST}${portspec}/webmail/rpc.php\$1 [L,R]\n"; |
| 36 |
} else { |
| 37 |
$OUT .= " Alias /Microsoft-Server-ActiveSync /usr/share/horde/rpc.php\n"; |
| 38 |
$OUT .= " Alias /autodiscover/autodiscover.xml /usr/share/horde/rpc.php\n"; |
Parent Directory
| 
Revision Log
| 
Revision Graph
