summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2008-11-29 17:18:52 +0000
committerthomascube <thomas@roundcube.net>2008-11-29 17:18:52 +0000
commitfa898a4a84202f0ba28c27a39e059c6f5a442c4e (patch)
tree5df973cec3ae3effb22aa835b827839f14fa5b81
parent2bedfab77a33da76bb450bff20de76c4ecdf9898 (diff)
Simplify MYSQL database initialization instructions
-rw-r--r--INSTALL24
-rw-r--r--SQL/mysql.initial.sql (renamed from SQL/mysql5.initial.sql)0
2 files changed, 7 insertions, 17 deletions
diff --git a/INSTALL b/INSTALL
index 0c3b05dee..8d57eb2a1 100644
--- a/INSTALL
+++ b/INSTALL
@@ -46,8 +46,8 @@ INSTALLATION
DATABASE SETUP
==============
-* MySQL 4.0.x
--------------
+* MySQL
+-------
Setting up the mysql database can be done by creating an empty database,
importing the table layout and granting the proper permissions to the
roundcube user. Here is an example of that procedure:
@@ -57,26 +57,16 @@ roundcube user. Here is an example of that procedure:
> GRANT ALL PRIVILEGES ON roundcubemail.* TO roundcube@localhost
IDENTIFIED BY 'password';
> quit
-# mysql roundcubemail < SQL/mysql.initial.sql
-
-
-* MySQL 4.1.x/5.x
------------------
-For MySQL version 4.1 and up, it's recommended to create the database for
-RoundCube with utf-8 charset. Here's an example of the init procedure:
-
-# mysql
-> CREATE DATABASE roundcubemail DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
-> GRANT ALL PRIVILEGES ON roundcubemail.* TO roundcube@localhost
- IDENTIFIED BY 'password';
-> quit
-# mysql roundcubemail < SQL/mysql5.initial.sql
+# mysql roundcubemail < SQL/mysql.initial.sql
-Note: 'password' is the master password for the roundcube user. It is strongly
+Note 1: 'password' is the master password for the roundcube user. It is strongly
recommended you replace this with a more secure password. Please keep in
mind: You need to specify this password later in 'config/db.inc.php'.
+Note 2: For MySQL version 4.1 and up, it's recommended to create the database for
+RoundCube with utf-8 charset.
+
* SQLite
--------
diff --git a/SQL/mysql5.initial.sql b/SQL/mysql.initial.sql
index 5a1bfd1b9..5a1bfd1b9 100644
--- a/SQL/mysql5.initial.sql
+++ b/SQL/mysql.initial.sql