diff -Nur e-smith-ibays-2.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/20IbayContent e-smith-ibays-2.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/20IbayContent --- e-smith-ibays-2.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/20IbayContent 2016-02-05 17:52:37.000000000 -0500 +++ e-smith-ibays-2.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/20IbayContent 2020-06-27 14:37:46.069000000 -0400 @@ -14,10 +14,9 @@ $OUT .= " DocumentRoot $basedir/html\n"; - my $SSLPort = $modSSL{'TCPPort'} || '443'; - if (( $port ne $SSLPort ) && ( $ssl_domain eq 'enabled')) + if (( $port ne $httpsPort ) && ( $ssl_domain eq 'enabled')) { - my $portspec = ($SSLPort eq 443) ? "" : ":$SSLPort"; + my $portspec = ($httpsPort eq 443) ? "" : ":$httpsPort"; $OUT .= " RewriteEngine on\n"; $OUT .= " RewriteRule ^/(.*|\$) https://%{HTTP_HOST}${portspec}/\$1 [R,L]\n"; } @@ -51,10 +50,9 @@ $OUT .= "\n"; $OUT .= " # $key ibay ($name)\n"; $OUT .= "\n"; - my $SSLPort = $modSSL{'TCPPort'} || '443'; - if (( $port ne $SSLPort ) && (($ibay->prop('SSL') || 'disabled') eq 'enabled')){ - my $portspec = ($SSLPort eq 443) ? "" : ":$SSLPort"; + if (( $port ne $httpsPort ) && (($ibay->prop('SSL') || 'disabled') eq 'enabled')){ + my $portspec = ($httpsPort eq 443) ? "" : ":$httpsPort"; $OUT .= " RewriteEngine on\n"; $OUT .= " RewriteRule ^/$key(/.*|\$) https://%{HTTP_HOST}${portspec}/$key\$1 \[L,R\]\n"; }