Lines 456-461
my %config_defaults = (
Link Here
|
456 |
'DB_NAME' => 'koha', |
456 |
'DB_NAME' => 'koha', |
457 |
'DB_USER' => 'kohaadmin', |
457 |
'DB_USER' => 'kohaadmin', |
458 |
'DB_PASS' => 'katikoan', |
458 |
'DB_PASS' => 'katikoan', |
|
|
459 |
'DB_USE_TLS' => 'no', |
460 |
'DB_TLS_CA_CERTIFICATE' => '/etc/mysql-ssl/server-ca.pem', |
461 |
'DB_TLS_CLIENT_CERTIFICATE' => '/etc/mysql-ssl/client-cert.pem', |
462 |
'DB_TLS_CLIENT_KEY' => '/etc/mysql-ssl/client-key.pem', |
459 |
'INSTALL_SRU' => 'yes', |
463 |
'INSTALL_SRU' => 'yes', |
460 |
'INSTALL_PAZPAR2' => 'no', |
464 |
'INSTALL_PAZPAR2' => 'no', |
461 |
'AUTH_INDEX_MODE' => 'dom', |
465 |
'AUTH_INDEX_MODE' => 'dom', |
Lines 502-507
else {
Link Here
|
502 |
my %valid_config_values = ( |
506 |
my %valid_config_values = ( |
503 |
'INSTALL_MODE' => { 'standard' => 1, 'single' => 1, 'dev' => 1 }, |
507 |
'INSTALL_MODE' => { 'standard' => 1, 'single' => 1, 'dev' => 1 }, |
504 |
'DB_TYPE' => { 'mysql' => 1, 'Pg' => 1 }, |
508 |
'DB_TYPE' => { 'mysql' => 1, 'Pg' => 1 }, |
|
|
509 |
'DB_USE_TLS' => {'yes', 'no'}, |
505 |
'INSTALL_SRU' => { 'yes' => 1, 'no' => 1 }, |
510 |
'INSTALL_SRU' => { 'yes' => 1, 'no' => 1 }, |
506 |
'AUTH_INDEX_MODE' => { 'grs1' => 1, 'dom' => 1 }, |
511 |
'AUTH_INDEX_MODE' => { 'grs1' => 1, 'dom' => 1 }, |
507 |
'BIB_INDEX_MODE' => { 'grs1' => 1, 'dom' => 1 }, |
512 |
'BIB_INDEX_MODE' => { 'grs1' => 1, 'dom' => 1 }, |
Lines 1032-1037
DMBS);
Link Here
|
1032 |
Please specify the name of the database to be |
1037 |
Please specify the name of the database to be |
1033 |
used by Koha); |
1038 |
used by Koha); |
1034 |
$config{'DB_NAME'} = _get_value('DB_NAME', $msg, $defaults->{'DB_NAME'}, $valid_values, $install_log_values); |
1039 |
$config{'DB_NAME'} = _get_value('DB_NAME', $msg, $defaults->{'DB_NAME'}, $valid_values, $install_log_values); |
|
|
1040 |
if ($config{'DB_TYPE'} eq 'mysql'){ |
1041 |
$msg = q( |
1042 |
Please specify whether the connection to MySQL will use TLS |
1043 |
); |
1044 |
$config{'DB_USE_TLS'} = _get_value('DB_USE_TLS', $msg, $defaults->{'DB_USE_TLS'}, $valid_values, $install_log_values); |
1045 |
} |
1046 |
if ($config{'DB_USE_TLS'} eq 'yes'){ |
1047 |
$msg = q( |
1048 |
Please enter the path to the CA certificate for TLS |
1049 |
); |
1050 |
$config{'DB_TLS_CA_CERTIFICATE'} = _get_value('DB_TLS_CA_CERTIFICATE', $msg, $defaults->{'DB_TLS_CA_CERTIFICATE'}, $valid_values, $install_log_values); |
1051 |
|
1052 |
$msg = q( |
1053 |
Please enter the path to the client certificate for TLS |
1054 |
); |
1055 |
$config{'DB_TLS_CLIENT_CERTIFICATE'} = _get_value('DB_TLS_CLIENT_CERTIFICATE', $msg, $defaults->{'DB_TLS_CLIENT_CERTIFICATE'}, $valid_values, $install_log_values); |
1056 |
$msg = q( |
1057 |
Please enter the path to the client key for TLS |
1058 |
); |
1059 |
$config{'DB_TLS_CLIENT_KEY'} = _get_value('DB_TLS_CLIENT_KEY', $msg, $defaults->{'DB_TLS_CLIENT_KEY'}, $valid_values, $install_log_values); |
1060 |
} |
1035 |
|
1061 |
|
1036 |
$msg = q( |
1062 |
$msg = q( |
1037 |
Please specify the user that owns the database to be |
1063 |
Please specify the user that owns the database to be |