1 |
stephdl |
1.1 |
diff -Nur e-smith-ibays-2.4.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/20IbayContent e-smith-ibays-2.4.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/20IbayContent |
2 |
|
|
--- e-smith-ibays-2.4.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/20IbayContent 2014-04-17 22:34:34.354833806 +0200 |
3 |
|
|
+++ e-smith-ibays-2.4.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/20IbayContent 2014-04-17 22:36:16.057760122 +0200 |
4 |
|
|
@@ -10,9 +10,16 @@ |
5 |
|
|
my $ibay = $virtualHostContent; |
6 |
|
|
my $basedir = "/home/e-smith/files/ibays/$ibay"; |
7 |
|
|
my $cgiBin = $accounts->get_prop($ibay, "CgiBin") || ""; |
8 |
|
|
+ my $ssl_domain = $accounts->get_prop($ibay, "SSL") || "disabled"; |
9 |
|
|
|
10 |
|
|
$OUT .= " DocumentRoot $basedir/html\n"; |
11 |
|
|
|
12 |
|
|
+ my $SSLPort = $modSSL{'TCPPort'} || '443'; |
13 |
|
|
+ if (( $port ne $SSLPort ) && ( $ssl_domain eq 'enabled')){ |
14 |
|
|
+ $OUT .= " RewriteEngine on\n"; |
15 |
|
|
+ $OUT .= " RewriteRule ^/(/.*|\$) https://%{HTTP_HOST}/\$1 [R,L]\n"; |
16 |
|
|
+ } |
17 |
|
|
+ |
18 |
|
|
if ($cgiBin) |
19 |
|
|
{ |
20 |
|
|
$OUT .= " ScriptAlias /cgi-bin $basedir/cgi-bin\n"; |