summaryrefslogtreecommitdiff
path: root/roundcubemail
diff options
context:
space:
mode:
authorthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2008-11-29 17:18:52 +0000
committerthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2008-11-29 17:18:52 +0000
commit1f9b0c154a5485b2c14d96eafbc1669912bcc3f2 (patch)
tree6d4ae6b89d042a0ea70ee4a231a82df09dfb6bbf /roundcubemail
parentc9eea799ce5933c25d57f3d44f9ecd4a13642ae5 (diff)
Simplify MYSQL database initialization instructions
git-svn-id: https://svn.roundcube.net/trunk@2101 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail')
-rw-r--r--roundcubemail/INSTALL24
-rw-r--r--roundcubemail/SQL/mysql.initial.sql (renamed from roundcubemail/SQL/mysql5.initial.sql)0
2 files changed, 7 insertions, 17 deletions
diff --git a/roundcubemail/INSTALL b/roundcubemail/INSTALL
index 0c3b05dee..8d57eb2a1 100644
--- a/roundcubemail/INSTALL
+++ b/roundcubemail/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/roundcubemail/SQL/mysql5.initial.sql b/roundcubemail/SQL/mysql.initial.sql
index 5a1bfd1b9..5a1bfd1b9 100644
--- a/roundcubemail/SQL/mysql5.initial.sql
+++ b/roundcubemail/SQL/mysql.initial.sql