Download as
Browse Code »

Commit 13978f33d8469424318139921f316416eccc1b00

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

Merge pull request #2420 from koenpunt/patch-1 

Remove wget dependency, now all curl
Showing 1 changed file with 4 additions and 5 deletions   Show diff stats
doc/install/installation.md
  Diff comments   View file @13978f3
@@ -52,7 +52,7 @@ edited by hand. But, you can use any editor you like instead. @@ -52,7 +52,7 @@ edited by hand. But, you can use any editor you like instead.
52 52
53 Install the required packages: 53 Install the required packages:
54 54
55 - sudo apt-get install -y build-essential zlib1g-dev libyaml-dev libssl-dev libgdbm-dev libreadline-dev libncurses5-dev libffi-dev wget curl git-core openssh-server redis-server postfix checkinstall libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev 55 + 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
56 56
57 Make sure you have the right version of Python installed. 57 Make sure you have the right version of Python installed.
58 58
@@ -77,8 +77,7 @@ Make sure you have the right version of Python installed. @@ -77,8 +77,7 @@ Make sure you have the right version of Python installed.
77 Download and compile it: 77 Download and compile it:
78 78
79 mkdir /tmp/ruby && cd /tmp/ruby 79 mkdir /tmp/ruby && cd /tmp/ruby
80 - wget http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.3-p327.tar.gz  
81 - tar xfvz ruby-1.9.3-p327.tar.gz 80 + curl --progress http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.3-p327.tar.gz | tar xz
82 cd ruby-1.9.3-p327 81 cd ruby-1.9.3-p327
83 ./configure 82 ./configure
84 make 83 make
@@ -277,7 +276,7 @@ used for the `email.from` setting in `config/gitlab.yml`) @@ -277,7 +276,7 @@ used for the `email.from` setting in `config/gitlab.yml`)
277 276
278 Download the init script (will be /etc/init.d/gitlab): 277 Download the init script (will be /etc/init.d/gitlab):
279 278
280 - sudo wget https://raw.github.com/gitlabhq/gitlab-recipes/master/init.d/gitlab -P /etc/init.d/ 279 + sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlab-recipes/master/init.d/gitlab
281 sudo chmod +x /etc/init.d/gitlab 280 sudo chmod +x /etc/init.d/gitlab
282 281
283 Make GitLab start on boot: 282 Make GitLab start on boot:
@@ -318,7 +317,7 @@ If you can't or don't want to use Nginx as your web server, have a look at the @@ -318,7 +317,7 @@ If you can't or don't want to use Nginx as your web server, have a look at the
318 317
319 Download an example site config: 318 Download an example site config:
320 319
321 - sudo wget https://raw.github.com/gitlabhq/gitlab-recipes/master/nginx/gitlab -P /etc/nginx/sites-available/ 320 + sudo curl --output /etc/nginx/sites-available/gitlab https://raw.github.com/gitlabhq/gitlab-recipes/master/nginx/gitlab
322 sudo ln -s /etc/nginx/sites-available/gitlab /etc/nginx/sites-enabled/gitlab 321 sudo ln -s /etc/nginx/sites-available/gitlab /etc/nginx/sites-enabled/gitlab
323 322
324 Make sure to edit the config file to match your setup: 323 Make sure to edit the config file to match your setup: