diff -Nur e-smith-ibays-2.4.0-original/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 --- e-smith-ibays-2.4.0-original/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/20IbayContent 2008-10-07 19:35:53.000000000 +0200 +++ e-smith-ibays-2.4.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/20IbayContent 2013-09-16 19:57:39.668598361 +0200 @@ -42,7 +42,12 @@ $OUT .= "\n"; $OUT .= " # $key ibay ($name)\n"; $OUT .= "\n"; - + my $SSLPort = $modSSL{'TCPPort'} || '443'; + + if (( $port ne $SSLPort ) && (($ibay->prop('SSL') || 'enabled') eq 'enabled')){ + $OUT .= " RewriteEngine on\n"; + $OUT .= " RewriteRule ^/$key(/.*|\$) https://%{HTTP_HOST}/$key\$1 \[L,R\]\n"; + } if ($cgiBin) { $OUT .= " ScriptAlias /$key/cgi-bin $basedir/cgi-bin\n"; diff -Nur e-smith-ibays-2.4.0-original/root/etc/e-smith/web/functions/ibays e-smith-ibays-2.4.0/root/etc/e-smith/web/functions/ibays --- e-smith-ibays-2.4.0-original/root/etc/e-smith/web/functions/ibays 2008-10-07 19:35:53.000000000 +0200 +++ e-smith-ibays-2.4.0/root/etc/e-smith/web/functions/ibays 2013-09-16 19:52:27.961524745 +0200 @@ -120,6 +120,9 @@ + + + diff -Nur e-smith-ibays-2.4.0-original/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/ibays.pm e-smith-ibays-2.4.0/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/ibays.pm --- e-smith-ibays-2.4.0-original/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/ibays.pm 2013-01-31 22:31:37.000000000 +0100 +++ e-smith-ibays-2.4.0/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/ibays.pm 2013-09-16 19:49:43.576807649 +0200 @@ -248,6 +248,8 @@ $rec->prop('PublicAccess')); $q->param(-name=>'CgiBin',-value=> $rec->prop('CgiBin')); + $q->param(-name=>'SSL',-value=> + $rec->prop('SSL')); } } else { print qq( @@ -512,6 +514,7 @@ CgiBin => $self->cgi->param('CgiBin'), Group => $self->cgi->param('group'), PublicAccess => $self->cgi->param('publicAccess'), + SSL => $self->cgi->param('SSL'), UserAccess => $self->cgi->param('userAccess'), Uid => $uid, Gid => $uid, @@ -541,6 +544,7 @@ CgiBin => $self->cgi->param('CgiBin'), Group => $self->cgi->param('group'), PublicAccess => $self->cgi->param('publicAccess'), + SSL => $self->cgi->param('SSL'), UserAccess => $self->cgi->param('userAccess'), );