Tomas Cohen Arazi
1191ea4f44
This patch changes the installer template for step 2 (DB rights check) so it correctly displays MySQL-related message. The previous code was doing the wrong comparisson, thus yielding PostgreSQL documentation. To test: - Run: $ sudo koha-mysql kohadev > DROP DATABASE koha_kohadev ; CREATE DATABASE koha_kohadev; > REVOKE INSERT ON koha_kohadev.* FROM 'koha_kohadev'@'localhost'; > FLUSH PRIVILEGES; \q - Run the webinstaller through step 2 => FAIL: You get the message in the attached screenshot - Apply the patch, reload => SUCCESS: You are displayed a different warning message, with a link to up-to-date MySQL docs on GRANT - Fix permissions for the user: $ sudo koha-mysql kohadev > GRANT ALL PRIVILEGES on koha_kohadev.* TO 'koha_kohadev'@'localhost'; > FLUSH PRIVILEGES; \q - Reload => SUCCESS: All checks are correct and you can move on - Sign off :-D Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
63 lines
2.7 KiB
Text
63 lines
2.7 KiB
Text
[% INCLUDE 'doc-head-open.inc' %]<title>Koha › Web installer › Step 2</title>
|
|
[% INCLUDE 'installer-doc-head-close.inc' %]
|
|
<div>
|
|
<h1 id="logo"><img alt="Koha" src="[% interface %]/[% theme %]/img/koha.org-logo.gif" /> Web installer › Step 2</h1>
|
|
<h2 align="center">Database settings:</h2>
|
|
<ul>
|
|
<li><em>database type : </em>[% dbms %]</li>
|
|
<li><em>database name : </em>[% dbname %]</li>
|
|
<li><em>database host : </em>[% hostname %]</li>
|
|
<li><em>database port : </em>[% port %] (probably OK if blank)</li>
|
|
<li><em>database user : </em>[% user %]</li>
|
|
</ul>
|
|
<div>
|
|
[% IF ( dbconnection ) %]
|
|
<form name="checkdbparameters" type="post" action="install.pl">
|
|
[% IF ( checkdatabaseaccess ) %]
|
|
<p>Connection established.</p>
|
|
[% IF ( checkdatabasecreated ) %]
|
|
<p>Database <code>[% dbname %]</code> exists.</p>
|
|
[% IF ( checkgrantaccess ) %]
|
|
<p>User <code>[% user %]</code> has all required privileges on database <code>[% dbname %]</code>.</p>
|
|
[% ELSE %]
|
|
<p class="error">user <code>[% user %]</code> doesn't have enough privilege on database <code>[% dbname %]</code></p>
|
|
<p class="tip">Ask for or make a change in the user's privileges. Need help? See
|
|
[% IF dbms == 'mysql' %]<a href="https://dev.mysql.com/doc/refman/5.5/en/grant.html">
|
|
[% ELSE %]<a href="http://www.postgresql.org/docs/8.2/interactive/sql-createrole.html">
|
|
[% END %]this page</a>.
|
|
</p>
|
|
<p class="tip">
|
|
User <code>[% user %]</code> must have USAGE, INSERT, UPDATE, DELETE, DROP and CREATE privileges on <code>[% dbname %]</code>
|
|
</p>
|
|
[% END %]
|
|
[% ELSE %]
|
|
<p class="error">No database named <code>[% dbname %]</code> detected.</p>
|
|
<p class="tip">Please create the database before continuing.</p>
|
|
[% END %]
|
|
[% ELSE %]
|
|
<div class="error">[% error %] : [% message %]
|
|
</div>
|
|
<div class="tip">
|
|
<ul>
|
|
<li>Check that your database is running.</li>
|
|
<li>Check your database settings in <code>koha-conf.xml</code>. </li>
|
|
<li>Check the hostname setting in <code>koha-conf.xml</code>.
|
|
Some database servers require <code>127.0.0.1</code> rather than <code>localhost</code>.</li>
|
|
</div>
|
|
<p>Please correct these errors and <a href="/cgi-bin/koha/installer/install.pl">start the installer</a> again.
|
|
[% END %]
|
|
[% IF ( error ) %][% ELSE %]
|
|
<input type="hidden" name="step" value="3" />
|
|
<p> Click 'Next' to continue <input value="Next >>" type="submit" /></p>
|
|
[% END %]
|
|
</form>
|
|
[% ELSE %]
|
|
<form name="checkinformation" type="post" action="install.pl">
|
|
<input type="hidden" name="step" value="2" />
|
|
<input type="hidden" name="checkdb" value="1" />
|
|
<p> Please click 'Next' to continue if this information is correct <input value="Next >>" type="submit" /></p>
|
|
</form>
|
|
[% END %]
|
|
</div>
|
|
</body>
|
|
</html>
|