Commit 0c570a7ec6496f266520307d987016b9178d7ba6

Authored by Jacob Vosmaer
2 parents 74dcbdb0 e4b90923

Merge branch 'improve-installation-section-of-readme' into 'master'

Improve Installation Section Of Readme
Showing 1 changed file with 9 additions and 7 deletions   Show diff stats
README.md
... ... @@ -6,16 +6,14 @@ For other installation options please see the
6 6  
7 7 ## Installation
8 8  
9   -After the steps below your GitLab instance should reachable over HTTP
10   -at the IP or hostname of your server, with an admin user with username
11   -`root` and password `5iveL!fe`.
  9 +Please [download the package][downloads] and follow the steps below.
12 10  
13 11 ### Ubuntu 12.04
14 12  
15 13 ```
16 14 sudo apt-get install openssh-server
17 15 sudo apt-get install postfix # sendmail or exim is also OK
18   -sudo dpkg -i gitlab-x.y.z.deb # this is the .deb you downloaded
  16 +sudo dpkg -i gitlab-x.y.z-omnibus-x.ubuntu.12.04_amd64.deb # this is the .deb you downloaded
19 17 sudo gitlab-ctl reconfigure
20 18 ```
21 19  
... ... @@ -24,12 +22,16 @@ sudo gitlab-ctl reconfigure
24 22 ```
25 23 sudo yum install openssh-server
26 24 sudo yum install postfix # sendmail or exim is also OK
27   -sudo rpm -i gitlab-x.y.z.rpm
  25 +sudo rpm -i gitlab-x.y.z_omnibus-x.el6.x86_64.rpm # this is the .rpm you downloaded
28 26 sudo gitlab-ctl reconfigure
29   -# Open up the firewall for HTTP and SSH
30   -sudo lokkit -s http -s ssh
  27 +sudo lokkit -s http -s ssh # Open up the firewall for HTTP and SSH
31 28 ```
32 29  
  30 +### After installation
  31 +
  32 +Your GitLab instance should reachable over HTTP at the IP or hostname of your server.
  33 +You can login as an admin user with username `root` and password `5iveL!fe`.
  34 +
33 35 ## Updating
34 36  
35 37 For update instructions, see [the update guide](doc/update.md).
... ...