Commit b0439a78 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'pg_installation' of /home/git/repositories/gitlab/gitlabhq

parents 0cdb15b0 a3731cf3
......@@ -7,7 +7,7 @@ production:
reconnect: false
database: gitlabhq_production
pool: 10
username: root
username: gitlab
password: "secure password"
# host: localhost
# socket: /tmp/mysql.sock
......
......@@ -6,8 +6,8 @@ production:
encoding: unicode
database: gitlabhq_production
pool: 10
username: git
password:
# username: git
# password:
# host: localhost
# port: 5432
# socket: /tmp/postgresql.sock
......
......@@ -58,7 +58,7 @@ GitLab supports the following databases:
sudo -u postgres psql -d template1
# Create a user for GitLab. (change $password to a real password)
template1=# CREATE USER git WITH PASSWORD '$password';
template1=# CREATE USER git;
# Create the GitLab production database & grant all privileges on database
template1=# CREATE DATABASE gitlabhq_production OWNER git;
......
......@@ -216,19 +216,19 @@ Make sure to edit both `gitlab.yml` and `unicorn.rb` to match your setup.
# Mysql
sudo -u git cp config/database.yml.mysql config/database.yml
or
# PostgreSQL
sudo -u git cp config/database.yml.postgresql config/database.yml
# Make sure to update username/password in config/database.yml.
# You only need to adapt the production settings (first part).
# If you followed the database guide then please do as follows:
# Change 'root' to 'gitlab'
# Change 'secure password' with the value you have given to $password
# You can keep the double quotes around the password
sudo -u git -H editor config/database.yml
or
# PostgreSQL
sudo -u git cp config/database.yml.postgresql config/database.yml
# Make config/database.yml readable to git only
sudo -u git -H chmod o-rwx config/database.yml
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment