From fa898a4a84202f0ba28c27a39e059c6f5a442c4e Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Sat, 29 Nov 2008 12:18:52 -0500
Subject: [PATCH] Simplify MYSQL database initialization instructions
---
INSTALL | 24 +++++++-----------------
SQL/mysql.initial.sql | 0
2 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/INSTALL b/INSTALL
index 0c3b05d..8d57eb2 100644
--- a/INSTALL
+++ b/INSTALL
@@ -46,8 +46,8 @@
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 @@
> 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
-
-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
similarity index 100%
rename from SQL/mysql5.initial.sql
rename to SQL/mysql.initial.sql
--
Gitblit v1.9.1