@@ -, +, @@ connections. Added installer options. --- Makefile.PL | 14 ++++++++++++++ etc/koha-conf.xml | 2 +- rewrite-config.PL | 1 + 3 files changed, 16 insertions(+), 1 deletion(-) --- a/Makefile.PL +++ a/Makefile.PL @@ -418,6 +418,7 @@ my %config_defaults = ( 'DB_NAME' => 'koha', 'DB_USER' => 'kohaadmin', 'DB_PASS' => 'katikoan', + 'DB_MYSQL_SOCKET' => '', 'INSTALL_SRU' => 'yes', 'INSTALL_PAZPAR2' => 'no', 'AUTH_INDEX_MODE' => 'dom', @@ -898,6 +899,19 @@ DMBS); my $db_port_default = $config{'DB_TYPE'} eq 'mysql' ? '3306' : '5432'; $config{'DB_PORT'} = _get_value('DB_PORT', $msg, $db_port_default, $valid_values, $install_log_values); + if ($config{'DB_TYPE'} =~ /mysql/i || $config{'DB_TYPE'} =~ /mariadb/i) { + $msg = ' +Alternatively you can define a non-default +unix socket to use for '.$config{'DB_TYPE'}.'. This +must be configured if you have moved the +socket defined in "my.cnf" to a non-default +location. +Otherwise it is safe to leave this field empty. + +'.$config{'DB_TYPE'}.' socket location'; + $config{'DB_MYSQL_SOCKET'} = _get_value('DB_MYSQL_SOCKET', $msg, $defaults->{'DB_MYSQL_SOCKET'}, $valid_values, $install_log_values); + } + $msg = q( Please specify the name of the database to be used by Koha); --- a/etc/koha-conf.xml +++ a/etc/koha-conf.xml @@ -271,7 +271,7 @@ __PAZPAR2_TOGGLE_XML_POST__ __DB_NAME__ __DB_HOST__ __DB_PORT__ - + __DB_MYSQL_SOCKET__ __DB_USER__ __DB_PASS__ biblios --- a/rewrite-config.PL +++ a/rewrite-config.PL @@ -87,6 +87,7 @@ $prefix = $ENV{'INSTALL_BASE'} || "/usr"; "__DB_NAME__" => "koha", "__DB_HOST__" => $myhost, "__DB_PORT__" => "3306", + "__DB_MYSQL_SOCKET__" => "", "__DB_USER__" => "kohaadmin", "__DB_PASS__" => "katikoan", "__WEBMASTER_EMAIL__" => 'webmaster@'.$mydomain, --