Commit fcdcb1a6751354819410444ae7f38391e64a686d
1 parent
a7a2100f
Exists in
spb-stable
and in
3 other branches
Move database setup guide inside the installation.
Showing
3 changed files
with
20 additions
and
29 deletions
Show diff stats
doc/install/database_mysql.md
| 1 | ## Note | 1 | ## Note |
| 2 | 2 | ||
| 3 | -We do not recommend using MySQL due to various issues. For example, case [(in)sensitivity](https://dev.mysql.com/doc/refman/5.0/en/case-sensitivity.html) and [problems](http://bugs.mysql.com/bug.php?id=65830) that [suggested](http://bugs.mysql.com/bug.php?id=50909) [fixes](http://bugs.mysql.com/bug.php?id=65830) [have](http://bugs.mysql.com/bug.php?id=63164) . | 3 | +We do not recommend using MySQL due to various issues. For example, case [(in)sensitivity](https://dev.mysql.com/doc/refman/5.0/en/case-sensitivity.html) and [problems](http://bugs.mysql.com/bug.php?id=65830) that [suggested](http://bugs.mysql.com/bug.php?id=50909) [fixes](http://bugs.mysql.com/bug.php?id=65830) [have](http://bugs.mysql.com/bug.php?id=63164). |
| 4 | 4 | ||
| 5 | ## MySQL | 5 | ## MySQL |
| 6 | 6 |
doc/install/databases.md
| @@ -1,27 +0,0 @@ | @@ -1,27 +0,0 @@ | ||
| 1 | -# Setup Database | ||
| 2 | - | ||
| 3 | -GitLab supports the following databases: | ||
| 4 | - | ||
| 5 | -* PostgreSQL (preferred) | ||
| 6 | -* [MySQL](doc/install/database_mysql.md) | ||
| 7 | - | ||
| 8 | -## PostgreSQL | ||
| 9 | - | ||
| 10 | - # Install the database packages | ||
| 11 | - sudo apt-get install -y postgresql-9.1 postgresql-client libpq-dev | ||
| 12 | - | ||
| 13 | - # Login to PostgreSQL | ||
| 14 | - sudo -u postgres psql -d template1 | ||
| 15 | - | ||
| 16 | - # Create a user for GitLab. | ||
| 17 | - template1=# CREATE USER git; | ||
| 18 | - | ||
| 19 | - # Create the GitLab production database & grant all privileges on database | ||
| 20 | - template1=# CREATE DATABASE gitlabhq_production OWNER git; | ||
| 21 | - | ||
| 22 | - # Quit the database session | ||
| 23 | - template1=# \q | ||
| 24 | - | ||
| 25 | - # Try connecting to the new database with the new user | ||
| 26 | - sudo -u git -H psql -d gitlabhq_production | ||
| 27 | - |
doc/install/installation.md
| @@ -144,7 +144,25 @@ GitLab Shell is an ssh access and repository management software developed speci | @@ -144,7 +144,25 @@ GitLab Shell is an ssh access and repository management software developed speci | ||
| 144 | 144 | ||
| 145 | # 5. Database | 145 | # 5. Database |
| 146 | 146 | ||
| 147 | -To setup the PostgreSQL/MySQL database and dependencies please see [doc/install/databases.md](doc/install/databases.md). | 147 | +We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](doc/install/database_mysql.md). |
| 148 | + | ||
| 149 | + # Install the database packages | ||
| 150 | + sudo apt-get install -y postgresql-9.1 postgresql-client libpq-dev | ||
| 151 | + | ||
| 152 | + # Login to PostgreSQL | ||
| 153 | + sudo -u postgres psql -d template1 | ||
| 154 | + | ||
| 155 | + # Create a user for GitLab. | ||
| 156 | + template1=# CREATE USER git; | ||
| 157 | + | ||
| 158 | + # Create the GitLab production database & grant all privileges on database | ||
| 159 | + template1=# CREATE DATABASE gitlabhq_production OWNER git; | ||
| 160 | + | ||
| 161 | + # Quit the database session | ||
| 162 | + template1=# \q | ||
| 163 | + | ||
| 164 | + # Try connecting to the new database with the new user | ||
| 165 | + sudo -u git -H psql -d gitlabhq_production | ||
| 148 | 166 | ||
| 149 | 167 | ||
| 150 | # 6. GitLab | 168 | # 6. GitLab |