Download as
Browse Code »

Commit ebf6821f54386d154cf250053b1007b61b1f9a27

Authored by Dmitriy Zaporozhets
2 parents d83cf100 3a5d90c4
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #3766 from axilleas/docs 

Instructions update: install postfix separately, new privilege to mysql users, sockets dir. Fixes #3639
Showing 2 changed files with 39 additions and 19 deletions   Show diff stats
doc/install/installation.md
  Diff comments   View file @ebf6821
... ... @@ -42,7 +42,7 @@ edited by hand. But, you can use any editor you like instead.
42 42  
43 43 Install the required packages:
44 44  
45   - sudo apt-get install -y build-essential zlib1g-dev libyaml-dev libssl-dev libgdbm-dev libreadline-dev libncurses5-dev libffi-dev curl git-core openssh-server redis-server postfix checkinstall libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev
  45 + sudo apt-get install -y build-essential zlib1g-dev libyaml-dev libssl-dev libgdbm-dev libreadline-dev libncurses5-dev libffi-dev curl git-core openssh-server redis-server checkinstall libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev
46 46  
47 47 Make sure you have the right version of Python installed.
48 48  
... ... @@ -61,6 +61,11 @@ Make sure you have the right version of Python installed.
61 61 # If you get a "command not found" error create a link to the python binary
62 62 sudo ln -s /usr/bin/python /usr/bin/python2
63 63  
  64 +**Note:** In order to receive mail notifications, make sure to install a
  65 +mail server. By default, Debian is shipped with exim4 whereas Ubuntu
  66 +does not ship with one. The recommended mail server is postfix and you can install it with:
  67 +
  68 + sudo apt-get install postfix
64 69  
65 70 # 2. Ruby
66 71  
... ... @@ -132,10 +137,10 @@ To setup the MySQL/PostgreSQL database and dependencies please see [`doc/install
132 137 cd /home/git/gitlab
133 138  
134 139 # Checkout to stable release
135   - sudo -u git -H git checkout 5-0-stable
  140 + sudo -u git -H git checkout 5-1-stable
136 141  
137 142 **Note:**
138   -You can change `5-0-stable` to `master` if you want the *bleeding edge* version, but
  143 +You can change `5-1-stable` to `master` if you want the *bleeding edge* version, but
139 144 do so with caution!
140 145  
141 146 ## Configure it
... ... @@ -158,11 +163,13 @@ do so with caution!
158 163 # Create directory for satellites
159 164 sudo -u git -H mkdir /home/git/gitlab-satellites
160 165  
161   - # Create directory for pids and make sure GitLab can write to it
  166 + # Create directories for sockets/pids and make sure GitLab can write to them
162 167 sudo -u git -H mkdir tmp/pids/
  168 + sudo -u git -H mkdir tmp/sockets/
163 169 sudo chmod -R u+rwX tmp/pids/
  170 + sudo chmod -R u+rwX tmp/sockets/
164 171  
165   - # Copy the example Unicorn config
  172 + # Copy the example Puma config
166 173 sudo -u git -H cp config/puma.rb.example config/puma.rb
167 174  
168 175 **Important Note:**
... ...
doc/update/5.0-to-5.1.md
  Diff comments   View file @ebf6821
... ... @@ -3,36 +3,39 @@
3 3 * `unicorn` replaced with `puma`
4 4 * merge request cached diff will be truncated
5 5  
6   -### 1. stop server
  6 +### 1. Stop server
7 7  
8 8 sudo service gitlab stop
9 9  
10   -### 2. get latest code
11   -
12   -```
  10 +### 2. Get latest code
13 11  
  12 +```bash
  13 +cd /home/git/gitlab
14 14 sudo -u git -H git fetch
15 15 sudo -u git -H git checkout 5-1-stable
16   -
17 16 ```
18 17  
19   -### 3. Install libs, migrations etc
  18 +### 3. Update gitlab-shell
20 19  
  20 +```bash
  21 +cd /home/git/gitlab-shell
  22 +sudo -u git -H git fetch
  23 +sudo -u git -H git checkout v1.3.0
21 24 ```
22   -sudo -u git -H cp config/puma.rb.example config/puma.rb
23 25  
24   -# Mysql users:
25   -sudo -u git -H bundle install --without development test postgres --deployment
  26 +### 4. Install libs, migrations etc
26 27  
27   -# Postgres users:
28   -sudo -u git -H bundle install --without development test mysql --deployment
  28 +```bash
  29 +cd /home/git/gitlab
  30 +sudo rm tmp/sockets/gitlab.socket
  31 +sudo -u git -H cp config/puma.rb.example config/puma.rb
29 32  
  33 +sudo -u git -H bundle install --without development test postgres --deployment
30 34 sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
31 35 sudo -u git -H bundle exec rake migrate_merge_requests RAILS_ENV=production
32   -
33 36 ```
34 37  
35   -### 4. Update init.d script with a new one
  38 +### 5. Update init.d script with a new one
36 39  
37 40 ```bash
38 41 # init.d
... ... @@ -41,6 +44,16 @@ sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlab-rec
41 44 sudo chmod +x /etc/init.d/gitlab
42 45 ```
43 46  
44   -### 5. Start application
  47 +### 6. Mysql grant privileges
  48 +
  49 +Only if you are using mysql:
  50 +
  51 +```bash
  52 +mysql -u root -p
  53 +mysql> GRANT LOCK TABLES ON `gitlabhq_production`.* TO 'gitlab'@'localhost';
  54 +mysql> \q
  55 +```
  56 +
  57 +### 7. Start application
45 58  
46 59 sudo service gitlab start
... ...