Lines 420-425
my %config_defaults = (
Link Here
|
420 |
'DB_NAME' => 'koha', |
420 |
'DB_NAME' => 'koha', |
421 |
'DB_USER' => 'kohaadmin', |
421 |
'DB_USER' => 'kohaadmin', |
422 |
'DB_PASS' => 'katikoan', |
422 |
'DB_PASS' => 'katikoan', |
|
|
423 |
'DB_USE_TLS' => 'no', |
424 |
'DB_TLS_CA_CERTIFICATE' => '/etc/mysql-ssl/server-ca.pem', |
425 |
'DB_TLS_CLIENT_CERTIFICATE' => '/etc/mysql-ssl/client-cert.pem', |
426 |
'DB_TLS_CLIENT_KEY' => '/etc/mysql-ssl/client-key.pem', |
423 |
'INSTALL_SRU' => 'yes', |
427 |
'INSTALL_SRU' => 'yes', |
424 |
'INSTALL_PAZPAR2' => 'no', |
428 |
'INSTALL_PAZPAR2' => 'no', |
425 |
'AUTH_INDEX_MODE' => 'dom', |
429 |
'AUTH_INDEX_MODE' => 'dom', |
Lines 465-470
else {
Link Here
|
465 |
my %valid_config_values = ( |
469 |
my %valid_config_values = ( |
466 |
'INSTALL_MODE' => { 'standard' => 1, 'single' => 1, 'dev' => 1 }, |
470 |
'INSTALL_MODE' => { 'standard' => 1, 'single' => 1, 'dev' => 1 }, |
467 |
'DB_TYPE' => { 'mysql' => 1, 'Pg' => 1 }, |
471 |
'DB_TYPE' => { 'mysql' => 1, 'Pg' => 1 }, |
|
|
472 |
'DB_USE_TLS' => {'yes', 'no'}, |
468 |
'INSTALL_SRU' => { 'yes' => 1, 'no' => 1 }, |
473 |
'INSTALL_SRU' => { 'yes' => 1, 'no' => 1 }, |
469 |
'AUTH_INDEX_MODE' => { 'grs1' => 1, 'dom' => 1 }, |
474 |
'AUTH_INDEX_MODE' => { 'grs1' => 1, 'dom' => 1 }, |
470 |
'BIB_INDEX_MODE' => { 'grs1' => 1, 'dom' => 1 }, |
475 |
'BIB_INDEX_MODE' => { 'grs1' => 1, 'dom' => 1 }, |
Lines 900-905
DMBS);
Link Here
|
900 |
Please specify the name of the database to be |
905 |
Please specify the name of the database to be |
901 |
used by Koha); |
906 |
used by Koha); |
902 |
$config{'DB_NAME'} = _get_value('DB_NAME', $msg, $defaults->{'DB_NAME'}, $valid_values, $install_log_values); |
907 |
$config{'DB_NAME'} = _get_value('DB_NAME', $msg, $defaults->{'DB_NAME'}, $valid_values, $install_log_values); |
|
|
908 |
if ($config{'DB_TYPE'} eq 'mysql'){ |
909 |
$msg = q( |
910 |
Please specify whether the connection to MySQL will use TLS |
911 |
); |
912 |
$config{'DB_USE_TLS'} = _get_value('DB_USE_TLS', $msg, $defaults->{'DB_USE_TLS'}, $valid_values, $install_log_values); |
913 |
} |
914 |
if ($config{'DB_USE_TLS'} eq 'yes'){ |
915 |
$msg = q( |
916 |
Please enter the path to the CA certificate for TLS |
917 |
); |
918 |
$config{'DB_TLS_CA_CERTIFICATE'} = _get_value('DB_TLS_CA_CERTIFICATE', $msg, $defaults->{'DB_TLS_CA_CERTIFICATE'}, $valid_values, $install_log_values); |
919 |
|
920 |
$msg = q( |
921 |
Please enter the path to the client certificate for TLS |
922 |
); |
923 |
$config{'DB_TLS_CLIENT_CERTIFICATE'} = _get_value('DB_TLS_CLIENT_CERTIFICATE', $msg, $defaults->{'DB_TLS_CLIENT_CERTIFICATE'}, $valid_values, $install_log_values); |
924 |
$msg = q( |
925 |
Please enter the path to the client key for TLS |
926 |
); |
927 |
$config{'DB_TLS_CLIENT_KEY'} = _get_value('DB_TLS_CLIENT_KEY', $msg, $defaults->{'DB_TLS_CLIENT_KEY'}, $valid_values, $install_log_values); |
928 |
} |
903 |
|
929 |
|
904 |
$msg = q( |
930 |
$msg = q( |
905 |
Please specify the user that owns the database to be |
931 |
Please specify the user that owns the database to be |