| 1 |
jpp |
1.1 |
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 |
| 2 |
|
|
--- 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 |
| 3 |
|
|
+++ 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 |
| 4 |
|
|
@@ -14,10 +14,9 @@ |
| 5 |
|
|
|
| 6 |
|
|
$OUT .= " DocumentRoot $basedir/html\n"; |
| 7 |
|
|
|
| 8 |
|
|
- my $SSLPort = $modSSL{'TCPPort'} || '443'; |
| 9 |
|
|
- if (( $port ne $SSLPort ) && ( $ssl_domain eq 'enabled')) |
| 10 |
|
|
+ if (( $port ne $httpsPort ) && ( $ssl_domain eq 'enabled')) |
| 11 |
|
|
{ |
| 12 |
|
|
- my $portspec = ($SSLPort eq 443) ? "" : ":$SSLPort"; |
| 13 |
|
|
+ my $portspec = ($httpsPort eq 443) ? "" : ":$httpsPort"; |
| 14 |
|
|
$OUT .= " RewriteEngine on\n"; |
| 15 |
|
|
$OUT .= " RewriteRule ^/(.*|\$) https://%{HTTP_HOST}${portspec}/\$1 [R,L]\n"; |
| 16 |
|
|
} |
| 17 |
|
|
@@ -51,10 +50,9 @@ |
| 18 |
|
|
$OUT .= "\n"; |
| 19 |
|
|
$OUT .= " # $key ibay ($name)\n"; |
| 20 |
|
|
$OUT .= "\n"; |
| 21 |
|
|
- my $SSLPort = $modSSL{'TCPPort'} || '443'; |
| 22 |
|
|
|
| 23 |
|
|
- if (( $port ne $SSLPort ) && (($ibay->prop('SSL') || 'disabled') eq 'enabled')){ |
| 24 |
|
|
- my $portspec = ($SSLPort eq 443) ? "" : ":$SSLPort"; |
| 25 |
|
|
+ if (( $port ne $httpsPort ) && (($ibay->prop('SSL') || 'disabled') eq 'enabled')){ |
| 26 |
|
|
+ my $portspec = ($httpsPort eq 443) ? "" : ":$httpsPort"; |
| 27 |
|
|
$OUT .= " RewriteEngine on\n"; |
| 28 |
|
|
$OUT .= " RewriteRule ^/$key(/.*|\$) https://%{HTTP_HOST}${portspec}/$key\$1 \[L,R\]\n"; |
| 29 |
|
|
} |
Parent Directory
| 
Revision Log
| 
Revision Graph
