| 111 |
); |
); |
| 112 |
|
|
| 113 |
# Untaint $name before use in system() |
# Untaint $name before use in system() |
| 114 |
|
diff -Nur --no-dereference e-smith-ibays-2.6.0.old/root/etc/e-smith/db/accounts/migrate/20ibay-accounts e-smith-ibays-2.6.0/root/etc/e-smith/db/accounts/migrate/20ibay-accounts |
| 115 |
|
--- e-smith-ibays-2.6.0.old/root/etc/e-smith/db/accounts/migrate/20ibay-accounts 2016-02-05 17:52:36.000000000 -0500 |
| 116 |
|
+++ e-smith-ibays-2.6.0/root/etc/e-smith/db/accounts/migrate/20ibay-accounts 2021-03-10 00:58:57.504000000 -0500 |
| 117 |
|
@@ -4,5 +4,15 @@ |
| 118 |
|
# SME9 introduced SSLRequireSSL with enabled/disabled. |
| 119 |
|
# This replaces local customisation, so migrate 'on' to 'enabled' |
| 120 |
|
$ibay->set_prop ('SSLRequireSSL', 'enabled') if (($ibay->prop ('SSLRequireSSL') || '') eq 'on'); |
| 121 |
|
+ |
| 122 |
|
+ # SME10 merge SSL property (setting to redirect to https) with SSLRequireSSL (setting to force SSL in a directory) |
| 123 |
|
+ # while they have two different purpose, most admin will want to protect one directory with SSL and ease access to their |
| 124 |
|
+ # client to gently redirect them to https, hence the merge. |
| 125 |
|
+ my $SSL = $DB->get_prop_and_delete($ibay->key, 'SSL') || 'disabled'; |
| 126 |
|
+ |
| 127 |
|
+ # if SSL is enabled or SSLRequireSSL is enabled we want the new one enabled |
| 128 |
|
+ # default remains empty for disabled for the moment |
| 129 |
|
+ $ibay->set_prop('SSLRequireSSL','enabled') if ($SSL eq 'enabled'); |
| 130 |
|
+ |
| 131 |
|
} |
| 132 |
|
} |
Parent Directory
| 
Revision Log
| 
Revision Graph
| 
Patch
