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

(-)a/debian/templates/koha-conf-site.xml.in (+3 lines)
Lines 250-256 __END_SRU_PUBLICSERVER__ Link Here
250
<config>
250
<config>
251
 <db_scheme>mysql</db_scheme>
251
 <db_scheme>mysql</db_scheme>
252
 <database>__DB_NAME__</database>
252
 <database>__DB_NAME__</database>
253
 <!-- basic installs have the DB on the same machine,
254
      if not, tweak these next two entries -->
253
 <hostname>__DB_HOST__</hostname>
255
 <hostname>__DB_HOST__</hostname>
256
 <webserver>__DB_HOST__</webserver>
254
 <port>3306</port>
257
 <port>3306</port>
255
 <user>__DB_USER__</user>
258
 <user>__DB_USER__</user>
256
 <pass>__DB_PASS__</pass>
259
 <pass>__DB_PASS__</pass>
(-)a/installer/install.pl (-6 / +6 lines)
Lines 44-53 $info{'dbms'} = Link Here
44
  (   C4::Context->config("db_scheme")
44
  (   C4::Context->config("db_scheme")
45
    ? C4::Context->config("db_scheme")
45
    ? C4::Context->config("db_scheme")
46
    : "mysql" );
46
    : "mysql" );
47
$info{'hostname'} = C4::Context->config("hostname");
47
$info{'hostname'}  = C4::Context->config("hostname");
48
$info{'port'}     = C4::Context->config("port");
48
$info{'webserver'} = C4::Context->config("webserver");
49
$info{'user'}     = C4::Context->config("user");
49
$info{'port'}      = C4::Context->config("port");
50
$info{'password'} = C4::Context->config("pass");
50
$info{'user'}      = C4::Context->config("user");
51
$info{'password'}  = C4::Context->config("pass");
51
my $dbh = DBI->connect(
52
my $dbh = DBI->connect(
52
    "DBI:$info{dbms}:dbname=$info{dbname};host=$info{hostname}"
53
    "DBI:$info{dbms}:dbname=$info{dbname};host=$info{hostname}"
53
      . ( $info{port} ? ";port=$info{port}" : "" ),
54
      . ( $info{port} ? ";port=$info{port}" : "" ),
Lines 113-119 elsif ( $step && $step == 2 ) { Link Here
113
                #Check if user have all necessary grants on this database.
114
                #Check if user have all necessary grants on this database.
114
                my $rq =
115
                my $rq =
115
                  $dbh->prepare(
116
                  $dbh->prepare(
116
                    "SHOW GRANTS FOR \'$info{user}\'\@'$info{hostname}'");
117
                    "SHOW GRANTS FOR \'$info{user}\'\@'$info{webserver}'");
117
                $rq->execute;
118
                $rq->execute;
118
                my $grantaccess;
119
                my $grantaccess;
119
                while ( my ($line) = $rq->fetchrow ) {
120
                while ( my ($line) = $rq->fetchrow ) {
120
- 

Return to bug 16690