Download as
Browse Code »

Commit e1ac3db92741907b5c085d3e236a02d953cfe0cc

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

Merge branch 'change-to-default-installer' of /home/git/repositories/gitlab/gitlabhq

Showing 1 changed file with 10 additions and 8 deletions   Show diff stats
doc/install/installation.md
  Diff comments   View file @e1ac3db
@@ -42,11 +42,13 @@ up-to-date and install it. @@ -42,11 +42,13 @@ up-to-date and install it.
42 apt-get install sudo -y 42 apt-get install sudo -y
43 43
44 **Note:** 44 **Note:**
45 -Vim is an editor that is used here whenever there are files that need to be  
46 -edited by hand. But, you can use any editor you like instead. 45 +During this installation some files will need to be edited manually.
  46 +If you are familiar with vim set it as default editor with the commands below.
  47 +If you are not familiar with vim please skip this and keep using the default editor.
47 48
48 - # Install vim 49 + # Install vim and set as default editor
49 sudo apt-get install -y vim 50 sudo apt-get install -y vim
  51 + sudo update-alternatives --set editor /usr/bin/vim.basic
50 52
51 Install the required packages: 53 Install the required packages:
52 54
@@ -123,7 +125,7 @@ GitLab Shell is a ssh access and repository management software developed specia @@ -123,7 +125,7 @@ GitLab Shell is a ssh access and repository management software developed specia
123 125
124 # Edit config and replace gitlab_url 126 # Edit config and replace gitlab_url
125 # with something like 'http://domain.com/' 127 # with something like 'http://domain.com/'
126 - sudo -u git -H vim config.yml 128 + sudo -u git -H editor config.yml
127 129
128 # Do setup 130 # Do setup
129 sudo -u git -H ./bin/install 131 sudo -u git -H ./bin/install
@@ -162,7 +164,7 @@ You can change `5-3-stable` to `master` if you want the *bleeding edge* version, @@ -162,7 +164,7 @@ You can change `5-3-stable` to `master` if you want the *bleeding edge* version,
162 164
163 # Make sure to change "localhost" to the fully-qualified domain name of your 165 # Make sure to change "localhost" to the fully-qualified domain name of your
164 # host serving GitLab where necessary 166 # host serving GitLab where necessary
165 - sudo -u git -H vim config/gitlab.yml 167 + sudo -u git -H editor config/gitlab.yml
166 168
167 # Make sure GitLab can write to the log/ and tmp/ directories 169 # Make sure GitLab can write to the log/ and tmp/ directories
168 sudo chown -R git log/ 170 sudo chown -R git log/
@@ -188,7 +190,7 @@ You can change `5-3-stable` to `master` if you want the *bleeding edge* version, @@ -188,7 +190,7 @@ You can change `5-3-stable` to `master` if you want the *bleeding edge* version,
188 190
189 # Enable cluster mode if you expect to have a high load instance 191 # Enable cluster mode if you expect to have a high load instance
190 # Ex. change amount of workers to 3 for 2GB RAM server 192 # Ex. change amount of workers to 3 for 2GB RAM server
191 - sudo -u git -H vim config/puma.rb 193 + sudo -u git -H editor config/puma.rb
192 194
193 # Configure Git global settings for git user, useful when editing via web 195 # Configure Git global settings for git user, useful when editing via web
194 # Edit user.email according to what is set in gitlab.yml 196 # Edit user.email according to what is set in gitlab.yml
@@ -214,7 +216,7 @@ Make sure to edit both `gitlab.yml` and `puma.rb` to match your setup. @@ -214,7 +216,7 @@ Make sure to edit both `gitlab.yml` and `puma.rb` to match your setup.
214 # Change 'root' to 'gitlab' 216 # Change 'root' to 'gitlab'
215 # Change 'secure password' with the value you have given to $password 217 # Change 'secure password' with the value you have given to $password
216 # You can keep the double quotes around the password 218 # You can keep the double quotes around the password
217 - sudo -u git -H vim config/database.yml 219 + sudo -u git -H editor config/database.yml
218 220
219 # Make config/database.yml readable to git only 221 # Make config/database.yml readable to git only
220 sudo -u git -H chmod o-rwx config/database.yml 222 sudo -u git -H chmod o-rwx config/database.yml
@@ -295,7 +297,7 @@ Make sure to edit the config file to match your setup: @@ -295,7 +297,7 @@ Make sure to edit the config file to match your setup:
295 297
296 # Change YOUR_SERVER_FQDN to the fully-qualified 298 # Change YOUR_SERVER_FQDN to the fully-qualified
297 # domain name of your host serving GitLab. 299 # domain name of your host serving GitLab.
298 - sudo vim /etc/nginx/sites-available/gitlab 300 + sudo editor /etc/nginx/sites-available/gitlab
299 301
300 ## Restart 302 ## Restart
301 303