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

Dmitriy Zaporozhets
2 parents 0cdb15b0 a3731cf3
Showing 4 changed files with 10 additions and 10 deletions Show diff stats
config/database.yml.mysql
config/database.yml.postgresql
doc/install/databases.md
doc/install/installation.md
@@ -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,18 +216,18 @@ 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
...	...	@@ -7,7 +7,7 @@ production:
7	7	reconnect: false
8	8	database: gitlabhq_production
9	9	pool: 10
10		- username: root
	10	+ username: gitlab
11	11	password: "secure password"
12	12	# host: localhost
13	13	# socket: /tmp/mysql.sock
...	...
...	...	@@ -6,8 +6,8 @@ production:
6	6	encoding: unicode
7	7	database: gitlabhq_production
8	8	pool: 10
9		- username: git
10		- password:
	9	+ # username: git
	10	+ # password:
11	11	# host: localhost
12	12	# port: 5432
13	13	# socket: /tmp/postgresql.sock
...	...
...	...	@@ -58,7 +58,7 @@ GitLab supports the following databases:
58	58	sudo -u postgres psql -d template1
59	59
60	60	# Create a user for GitLab. (change $password to a real password)
61		- template1=# CREATE USER git WITH PASSWORD '$password';
	61	+ template1=# CREATE USER git;
62	62
63	63	# Create the GitLab production database & grant all privileges on database
64	64	template1=# CREATE DATABASE gitlabhq_production OWNER git;
...	...
...	...	@@ -216,18 +216,18 @@ Make sure to edit both `gitlab.yml` and `unicorn.rb` to match your setup.
216	216	# Mysql
217	217	sudo -u git cp config/database.yml.mysql config/database.yml
218	218
219		- or
220		-
221		- # PostgreSQL
222		- sudo -u git cp config/database.yml.postgresql config/database.yml
223		-
224	219	# Make sure to update username/password in config/database.yml.
225	220	# You only need to adapt the production settings (first part).
226	221	# If you followed the database guide then please do as follows:
227		- # Change 'root' to 'gitlab'
228	222	# Change 'secure password' with the value you have given to $password
229	223	# You can keep the double quotes around the password
230	224	sudo -u git -H editor config/database.yml
	225	+
	226	+ or
	227	+
	228	+ # PostgreSQL
	229	+ sudo -u git cp config/database.yml.postgresql config/database.yml
	230	+
231	231
232	232	# Make config/database.yml readable to git only
233	233	sudo -u git -H chmod o-rwx config/database.yml
...	...