summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarin Jankovski <marin@gitlab.com>2015-09-25 10:09:37 +0000
committerMarin Jankovski <marin@gitlab.com>2015-09-25 10:09:37 +0000
commitd0e74984631ece8579fe26262ad94c17a934ee26 (patch)
tree20917f584353bbdfb9160571a7edb1f1a8e4716d
parent718817fd8fcc0b3627fca73ca847d5fb676df980 (diff)
parent1c9deece3de01cc547852f4d0cc16f1741c78403 (diff)
downloadgitlab-ce-d0e74984631ece8579fe26262ad94c17a934ee26.tar.gz
Merge branch 'unicorn-listen-8080' into 'master'
Make sure Unicorn listens on localhost:8080 Some installations from source run into this when upgrading to 8.0. See merge request !1435
-rw-r--r--doc/update/7.14-to-8.0.md13
1 files changed, 13 insertions, 0 deletions
diff --git a/doc/update/7.14-to-8.0.md b/doc/update/7.14-to-8.0.md
index ed5c6c99e78..86c0825dff9 100644
--- a/doc/update/7.14-to-8.0.md
+++ b/doc/update/7.14-to-8.0.md
@@ -87,6 +87,19 @@ cd gitlab-git-http-server
sudo -u git -H make
```
+Make sure your unicorn.rb file contains a 'listen' line for
+'127.0.0.1:8080' and that this line is not commented out.
+
+```
+cd /home/git/gitlab
+grep ^listen config/unicorn.rb
+
+# If there is no 'listen' line for 127.0.0.1:8080, add it:
+sudo -u git tee -a config/unicorn.rb <<EOF
+listen "127.0.0.1:8080", :tcp_nopush => true
+EOF
+```
+
If your Git repositories are in a directory other than `/home/git/repositories`,
you need to tell `gitlab-git-http-server` about it via `/etc/gitlab/default`.
See `lib/support/init.d/gitlab.default.example` for the options.