Download as
Browse Code »

Commit 138e2a50b7d839bd37c21b2849df422f9dfef6bb

Authored by Dmitriy Zaporozhets
1 parent e8466a21
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

PostgreSQL is first one now 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 1 changed file with 8 additions and 10 deletions   Show diff stats
doc/install/installation.md
  Diff comments   View file @138e2a5
@@ -234,8 +234,8 @@ Make sure to edit both `gitlab.yml` and `unicorn.rb` to match your setup. @@ -234,8 +234,8 @@ Make sure to edit both `gitlab.yml` and `unicorn.rb` to match your setup.
234 234
235 ## Configure GitLab DB settings 235 ## Configure GitLab DB settings
236 236
237 - # Mysql  
238 - sudo -u git cp config/database.yml.mysql config/database.yml 237 + # PostgreSQL
  238 + sudo -u git cp config/database.yml.postgresql config/database.yml
239 239
240 # Make sure to update username/password in config/database.yml. 240 # Make sure to update username/password in config/database.yml.
241 # You only need to adapt the production settings (first part). 241 # You only need to adapt the production settings (first part).
@@ -245,10 +245,8 @@ Make sure to edit both `gitlab.yml` and `unicorn.rb` to match your setup. @@ -245,10 +245,8 @@ Make sure to edit both `gitlab.yml` and `unicorn.rb` to match your setup.
245 sudo -u git -H editor config/database.yml 245 sudo -u git -H editor config/database.yml
246 246
247 or 247 or
248 -  
249 - # PostgreSQL  
250 - sudo -u git cp config/database.yml.postgresql config/database.yml  
251 - 248 + # Mysql
  249 + sudo -u git cp config/database.yml.mysql config/database.yml
252 250
253 # Make config/database.yml readable to git only 251 # Make config/database.yml readable to git only
254 sudo -u git -H chmod o-rwx config/database.yml 252 sudo -u git -H chmod o-rwx config/database.yml
@@ -257,12 +255,12 @@ Make sure to edit both `gitlab.yml` and `unicorn.rb` to match your setup. @@ -257,12 +255,12 @@ Make sure to edit both `gitlab.yml` and `unicorn.rb` to match your setup.
257 255
258 cd /home/git/gitlab 256 cd /home/git/gitlab
259 257
260 - # For MySQL (note, the option says "without ... postgres")  
261 - sudo -u git -H bundle install --deployment --without development test postgres aws  
262 -  
263 - # Or for PostgreSQL (note, the option says "without ... mysql") 258 + # For PostgreSQL (note, the option says "without ... mysql")
264 sudo -u git -H bundle install --deployment --without development test mysql aws 259 sudo -u git -H bundle install --deployment --without development test mysql aws
265 260
  261 + # Or if you use MySQL (note, the option says "without ... postgres")
  262 + sudo -u git -H bundle install --deployment --without development test postgres aws
  263 +
266 264
267 ## Initialize Database and Activate Advanced Features 265 ## Initialize Database and Activate Advanced Features
268 266