@@ -399,7 +399,7 @@ Configure the database user and password:
399
399
export PATH=$PATH:/usr/pgsql-9.3/bin/
400
400
psql -d template1
401
401
402
- psql (8 .4.20 )
402
+ psql (9 .4.3 )
403
403
Type "help" for help.
404
404
template1=# CREATE USER git CREATEDB;
405
405
CREATE ROLE
@@ -494,26 +494,33 @@ Make sure to edit both `gitlab.yml` and `unicorn.rb` to match your setup.
494
494
495
495
### Configure GitLab DB settings
496
496
497
- # For MySQL
498
- sudo -u git -H cp config/database.yml{.mysql,}
497
+ # PostgreSQL only:
498
+ sudo -u git cp config/database.yml.postgresql config/database.yml
499
499
500
- # Make sure to update username/password in config/database.yml.
500
+ # MySQL only:
501
+ sudo -u git cp config/database.yml.mysql config/database.yml
502
+
503
+ # MySQL and remote PostgreSQL only:
504
+ # Update username/password in config/database.yml.
501
505
# You only need to adapt the production settings (first part).
502
506
# If you followed the database guide then please do as follows:
503
507
# Change 'secure password' with the value you have given to $password
504
508
# You can keep the double quotes around the password
505
509
sudo -u git -H editor config/database.yml
506
510
507
- or
508
-
509
- # For PostgreSQL
510
- sudo -u git -H cp config/database.yml{.postgresql,}
511
-
511
+ # PostgreSQL and MySQL:
512
512
# Make config/database.yml readable to git only
513
513
sudo -u git -H chmod o-rwx config/database.yml
514
514
515
515
### Install Gems
516
516
517
+ ** Note:** As of bundler 1.5.2, you can invoke ` bundle install -jN `
518
+ (where ` N ` the number of your processor cores) and enjoy the parallel gems installation with measurable
519
+ difference in completion time (~ 60% faster). Check the number of your cores with ` nproc ` .
520
+ For more information check this [ post] ( http://robots.thoughtbot.com/parallel-gem-installing-using-bundler ) .
521
+ First make sure you have bundler >= 1.5.2 (run ` bundle -v ` ) as it addresses some [ issues] ( https://devcenter.heroku.com/changelog-items/411 )
522
+ that were [ fixed] ( https://github.com/bundler/bundler/pull/2817 ) in 1.5.2.
523
+
517
524
cd /home/git/gitlab
518
525
519
526
# For MySQL (note, the option says "without ... postgres")
0 commit comments