diff -ruN e-smith-ibays-2.4.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess40ibays e-smith-ibays-2.4.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess40ibays --- e-smith-ibays-2.4.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess40ibays 2013-12-21 16:55:09.000000000 -0800 +++ e-smith-ibays-2.4.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess40ibays 2013-12-21 17:09:45.000000000 -0800 @@ -92,6 +92,7 @@ my $dynamicContent = $properties{'CgiBin'} || "disabled"; my $followSymLinks = $properties{'FollowSymLinks'} || "disabled"; my $indexes = $properties{'Indexes'} || "enabled"; + my $sslRequireSSL = $properties{'SSLRequireSSL'} || "disabled"; $OUT .= "\n"; $OUT .= "#------------------------------------------------------------\n"; $OUT .= "# $key ibay directories ($properties{'Name'})\n"; @@ -99,6 +100,10 @@ $OUT .= "\n"; $OUT .= "\n"; + if ($sslRequireSSL eq 'enabled') + { + $OUT .=" SSLRequireSSL\n"; + } $OUT .= " Options None\n"; $OUT .= " Options +Indexes\n" if ($indexes eq 'enabled'); $OUT .= " Options +FollowSymLinks\n" if ($followSymLinks eq 'enabled'); diff -ruN e-smith-ibays-2.4.0.ooo/root/etc/e-smith/db/accounts/migrate/20ibay-accounts e-smith-ibays-2.4.0/root/etc/e-smith/db/accounts/migrate/20ibay-accounts --- e-smith-ibays-2.4.0.ooo/root/etc/e-smith/db/accounts/migrate/20ibay-accounts 1969-12-31 16:00:00.000000000 -0800 +++ e-smith-ibays-2.4.0/root/etc/e-smith/db/accounts/migrate/20ibay-accounts 2014-01-02 19:45:40.000000000 -0800 @@ -0,0 +1,8 @@ +{ + foreach my $ibay ($DB->get_all_by_prop(type => 'ibay')) + { + # SME9 introduced SSLRequireSSL with enabled/disabled. + # This replaces local customisation, so migrate 'on' to 'enabled' + $ibay->set_prop ('SSLRequireSSL', 'enabled') if (($ibay->prop ('SSLRequireSSL') || '') eq 'on'); + } +}