Download as
Browse Code »

Commit 31359516408ec108d684a6b2b4ffe6098703aa78

Authored by Dmitriy Zaporozhets
2 parents 946595a5 72e2fe2c
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge branch 'database_doc' of /home/git/repositories/gitlab/gitlabhq

Showing 2 changed files with 4 additions and 4 deletions   Show diff stats
config/database.yml.mysql
  Diff comments   View file @3135951
... ... @@ -7,7 +7,7 @@ production:
7 7 reconnect: false
8 8 database: gitlabhq_production
9 9 pool: 10
10   - username: gitlab
  10 + username: git
11 11 password: "secure password"
12 12 # host: localhost
13 13 # socket: /tmp/mysql.sock
... ...
doc/install/databases.md
  Diff comments   View file @3135951
... ... @@ -25,19 +25,19 @@ GitLab supports the following databases:
25 25 # Create a user for GitLab
26 26 # do not type the 'mysql>', this is part of the prompt
27 27 # change $password in the command below to a real password you pick
28   - mysql> CREATE USER 'gitlab'@'localhost' IDENTIFIED BY '$password';
  28 + mysql> CREATE USER 'git'@'localhost' IDENTIFIED BY '$password';
29 29  
30 30 # Create the GitLab production database
31 31 mysql> CREATE DATABASE IF NOT EXISTS `gitlabhq_production` DEFAULT CHARACTER SET `utf8` COLLATE `utf8_unicode_ci`;
32 32  
33 33 # Grant the GitLab user necessary permissions on the table.
34   - mysql> GRANT SELECT, LOCK TABLES, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER ON `gitlabhq_production`.* TO 'gitlab'@'localhost';
  34 + mysql> GRANT SELECT, LOCK TABLES, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER ON `gitlabhq_production`.* TO 'git'@'localhost';
35 35  
36 36 # Quit the database session
37 37 mysql> \q
38 38  
39 39 # Try connecting to the new database with the new user
40   - sudo -u git -H mysql -u gitlab -p -D gitlabhq_production
  40 + sudo -u git -H mysql -u git -p -D gitlabhq_production
41 41  
42 42 # Type the password you replaced $password with earlier
43 43  
... ...