diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-11-24 12:08:17 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-11-24 12:08:17 +0000 |
| commit | d5740d3bb6ad23c74e8968f62ec479929c63fb44 (patch) | |
| tree | 49c4bd52ee122035b97d7991da7296fe63df7954 | |
| parent | 9c56270672db4a847eebceff6b420c2142a959d3 (diff) | |
| parent | 391db2421eda4f69e73f18d45fa377f209670528 (diff) | |
| download | gitlab-ce-d5740d3bb6ad23c74e8968f62ec479929c63fb44.tar.gz | |
Merge branch '24908-install-instructions-seem-to-have-two-database-steps-out-of-order' into 'master'
Fix documentation to create the `pg_trm` extension before creating the DB
Closes #24908
See merge request !7735
| -rw-r--r-- | doc/install/installation.md | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/install/installation.md b/doc/install/installation.md index b5e2640b380..dabd69d7466 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -175,17 +175,17 @@ We recommend using a PostgreSQL database. For MySQL check the ```bash sudo -u postgres psql -d template1 -c "CREATE USER git CREATEDB;" ``` - -1. Create the GitLab production database and grant all privileges on database: + +1. Create the `pg_trgm` extension (required for GitLab 8.6+): ```bash - sudo -u postgres psql -d template1 -c "CREATE DATABASE gitlabhq_production OWNER git;" + sudo -u postgres psql -d template1 -c "CREATE EXTENSION IF NOT EXISTS pg_trgm;" ``` -1. Create the `pg_trgm` extension (required for GitLab 8.6+): +1. Create the GitLab production database and grant all privileges on database: ```bash - sudo -u postgres psql -d template1 -c "CREATE EXTENSION IF NOT EXISTS pg_trgm;" + sudo -u postgres psql -d template1 -c "CREATE DATABASE gitlabhq_production OWNER git;" ``` 1. Try connecting to the new database with the new user: |
