View | Details | Raw Unified | Return to bug 11974
Collapse All | Expand All

(-)a/Makefile.PL (+14 lines)
Lines 418-423 my %config_defaults = ( Link Here
418
  'DB_NAME'           => 'koha',
418
  'DB_NAME'           => 'koha',
419
  'DB_USER'           => 'kohaadmin',
419
  'DB_USER'           => 'kohaadmin',
420
  'DB_PASS'           => 'katikoan',
420
  'DB_PASS'           => 'katikoan',
421
  'DB_MYSQL_SOCKET'   => '',
421
  'INSTALL_SRU'       => 'yes',
422
  'INSTALL_SRU'       => 'yes',
422
  'INSTALL_PAZPAR2'   => 'no',
423
  'INSTALL_PAZPAR2'   => 'no',
423
  'AUTH_INDEX_MODE'   => 'dom',
424
  'AUTH_INDEX_MODE'   => 'dom',
Lines 898-903 DMBS); Link Here
898
    my $db_port_default = $config{'DB_TYPE'} eq 'mysql' ? '3306' : '5432';
899
    my $db_port_default = $config{'DB_TYPE'} eq 'mysql' ? '3306' : '5432';
899
    $config{'DB_PORT'} = _get_value('DB_PORT', $msg, $db_port_default, $valid_values, $install_log_values);
900
    $config{'DB_PORT'} = _get_value('DB_PORT', $msg, $db_port_default, $valid_values, $install_log_values);
900
901
902
    if ($config{'DB_TYPE'} =~ /mysql/i || $config{'DB_TYPE'} =~ /mariadb/i) {
903
        $msg = '
904
Alternatively you can define a non-default
905
unix socket to use for '.$config{'DB_TYPE'}.'. This
906
must be configured if you have moved the
907
socket defined in "my.cnf" to a non-default
908
location.
909
Otherwise it is safe to leave this field empty.
910
    
911
'.$config{'DB_TYPE'}.' socket location';
912
        $config{'DB_MYSQL_SOCKET'} = _get_value('DB_MYSQL_SOCKET', $msg, $defaults->{'DB_MYSQL_SOCKET'}, $valid_values, $install_log_values);
913
    }
914
    
901
    $msg = q(
915
    $msg = q(
902
Please specify the name of the database to be
916
Please specify the name of the database to be
903
used by Koha);
917
used by Koha);
(-)a/etc/koha-conf.xml (-1 / +1 lines)
Lines 271-277 __PAZPAR2_TOGGLE_XML_POST__ Link Here
271
 <database>__DB_NAME__</database>
271
 <database>__DB_NAME__</database>
272
 <hostname>__DB_HOST__</hostname>
272
 <hostname>__DB_HOST__</hostname>
273
 <port>__DB_PORT__</port>
273
 <port>__DB_PORT__</port>
274
<!-- <mysql_socket>__put your non-default mysql/mariadb socket path here. eg /tmp/mysqld.sock__</mysql_socket> -->
274
 <mysql_socket>__DB_MYSQL_SOCKET__</mysql_socket>
275
 <user>__DB_USER__</user>
275
 <user>__DB_USER__</user>
276
 <pass>__DB_PASS__</pass>
276
 <pass>__DB_PASS__</pass>
277
 <biblioserver>biblios</biblioserver>
277
 <biblioserver>biblios</biblioserver>
(-)a/rewrite-config.PL (-1 / +1 lines)
Lines 87-92 $prefix = $ENV{'INSTALL_BASE'} || "/usr"; Link Here
87
  "__DB_NAME__" => "koha",
87
  "__DB_NAME__" => "koha",
88
  "__DB_HOST__" => $myhost,
88
  "__DB_HOST__" => $myhost,
89
  "__DB_PORT__" => "3306",
89
  "__DB_PORT__" => "3306",
90
  "__DB_MYSQL_SOCKET__" => "",
90
  "__DB_USER__" => "kohaadmin",
91
  "__DB_USER__" => "kohaadmin",
91
  "__DB_PASS__" => "katikoan",
92
  "__DB_PASS__" => "katikoan",
92
  "__WEBMASTER_EMAIL__" => 'webmaster@'.$mydomain,
93
  "__WEBMASTER_EMAIL__" => 'webmaster@'.$mydomain,
93
- 

Return to bug 11974