Merge branch 'install_guide' of /home/git/repositories/gitlab/gitlab-ci

config/database.yml.postgresql

@@ -6,7 +6,7 @@ production:
   encoding: unicode
   database: gitlab_ci_production
   pool: 5
-  username: postgres
+  username: gitlab_ci
   password:
   # host: localhost
   # port: 5432

doc/installation.md

@@ -28,9 +28,9 @@ Install the required packages:
 Download Ruby and compile it:
     mkdir /tmp/ruby && cd /tmp/ruby
-    curl --progress http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.3-p392.tar.gz | tar xz
-    cd ruby-1.9.3-p392
-    ./configure
+    curl --progress http://cache.ruby-lang.org/pub/ruby/2.0/ruby-2.0.0-p353.tar.bz2 | tar xj
+    cd ruby-2.0.0-p353
+    ./configure --disable-install-rdoc
     make
     sudo make install
@@ -76,8 +76,8 @@ You can use either MySQL or PostgreSQL.
     # Login to PostgreSQL
     sudo -u postgres psql -d template1
-    # Create a user for GitLab. (change $password to a real password)
-    template1=# CREATE USER gitlab_ci WITH PASSWORD '$password';
+    # Create a user for GitLab. We do not specify a password because we are using peer authentication.
+    template1=# CREATE USER gitlab_ci;
     # Create the GitLab production database & grant all privileges on database
     template1=# CREATE DATABASE gitlab_ci_production OWNER gitlab_ci;
@@ -96,7 +96,7 @@ You can use either MySQL or PostgreSQL.
     cd gitlab-ci
-    sudo -u gitlab_ci -H git checkout 3-2-stable
+    sudo -u gitlab_ci -H git checkout 4-0-stable
 ## 6. Setup application
@@ -129,8 +129,8 @@ You can use either MySQL or PostgreSQL.
     # postgres
     sudo -u gitlab_ci -H cp config/database.yml.postgresql config/database.yml
- 
-    # Edit user/password
+
+    # Edit user/password (not necessary with default Postgres setup)
     sudo -u gitlab_ci -H editor config/database.yml
     # Setup tables
@@ -181,6 +181,10 @@ Make sure to edit the config file to match your setup:
     # of your host serving GitLab CI
     sudo editor /etc/nginx/sites-enabled/gitlab_ci
+## Check your configuration
+
+    sudo nginx -t
+
 ## Reload configuration
     sudo /etc/init.d/nginx reload