diff options
| author | Marin Jankovski <marin@gitlab.com> | 2014-02-20 11:42:58 +0100 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2014-02-20 12:31:04 +0100 |
| commit | fcdcb1a6751354819410444ae7f38391e64a686d (patch) | |
| tree | 64e65bd7bde1ba7f5f47d67ffd0ed80eea537d88 | |
| parent | a7a2100f3d3344669d951665dc8e2253451d859f (diff) | |
| download | gitlab-ce-fcdcb1a6751354819410444ae7f38391e64a686d.tar.gz | |
Move database setup guide inside the installation.
| -rw-r--r-- | doc/install/database_mysql.md | 2 | ||||
| -rw-r--r-- | doc/install/databases.md | 27 | ||||
| -rw-r--r-- | doc/install/installation.md | 20 |
3 files changed, 20 insertions, 29 deletions
diff --git a/doc/install/database_mysql.md b/doc/install/database_mysql.md index bb4c3e1ede0..4cf9b94c1a0 100644 --- a/doc/install/database_mysql.md +++ b/doc/install/database_mysql.md @@ -1,6 +1,6 @@ ## Note -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) . +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). ## MySQL diff --git a/doc/install/databases.md b/doc/install/databases.md deleted file mode 100644 index b43f6b76b21..00000000000 --- a/doc/install/databases.md +++ /dev/null @@ -1,27 +0,0 @@ -# Setup Database - -GitLab supports the following databases: - -* PostgreSQL (preferred) -* [MySQL](doc/install/database_mysql.md) - -## PostgreSQL - - # Install the database packages - sudo apt-get install -y postgresql-9.1 postgresql-client libpq-dev - - # Login to PostgreSQL - sudo -u postgres psql -d template1 - - # Create a user for GitLab. - template1=# CREATE USER git; - - # Create the GitLab production database & grant all privileges on database - template1=# CREATE DATABASE gitlabhq_production OWNER git; - - # Quit the database session - template1=# \q - - # Try connecting to the new database with the new user - sudo -u git -H psql -d gitlabhq_production - diff --git a/doc/install/installation.md b/doc/install/installation.md index 3b009148957..44d57b97efb 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -144,7 +144,25 @@ GitLab Shell is an ssh access and repository management software developed speci # 5. Database -To setup the PostgreSQL/MySQL database and dependencies please see [doc/install/databases.md](doc/install/databases.md). +We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](doc/install/database_mysql.md). + + # Install the database packages + sudo apt-get install -y postgresql-9.1 postgresql-client libpq-dev + + # Login to PostgreSQL + sudo -u postgres psql -d template1 + + # Create a user for GitLab. + template1=# CREATE USER git; + + # Create the GitLab production database & grant all privileges on database + template1=# CREATE DATABASE gitlabhq_production OWNER git; + + # Quit the database session + template1=# \q + + # Try connecting to the new database with the new user + sudo -u git -H psql -d gitlabhq_production # 6. GitLab |