[DRE-commits] [gitlab] 02/03: don't be default

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master-8.4
in repository gitlab.

commit 7e693ff6d0421c1cc86036467e2fe51b2c52949e
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat Jan 16 02:08:06 2016 +0530

    don't be default
---
 debian/conf/nginx.conf.example | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/conf/nginx.conf.example b/debian/conf/nginx.conf.example
index fc5475c..522ae81 100644
--- a/debian/conf/nginx.conf.example
+++ b/debian/conf/nginx.conf.example
@@ -17,7 +17,7 @@
 ## See installation.md#using-https for additional HTTPS configuration details.
 
 upstream gitlab-workhorse {
-  server unix:/home/git/gitlab/tmp/sockets/gitlab-workhorse.socket fail_timeout=0;
+  server unix:/usr/share/gitlab/tmp/sockets/gitlab-workhorse.socket fail_timeout=0;
 }
 
 ## Normal HTTP host
@@ -26,11 +26,11 @@ server {
   ## or delete the /etc/nginx/sites-enabled/default file. This will cause gitlab
   ## to be served if you visit any address that your server responds to, eg.
   ## the ip address of the server (http://x.x.x.x/)n 0.0.0.0:80 default_server;
-  listen 0.0.0.0:80 default_server;
-  listen [::]:80 default_server;
+  listen 0.0.0.0:80;
+  listen [::]:80;
   server_name YOUR_SERVER_FQDN; ## Replace this with something like gitlab.example.com
   server_tokens off; ## Don't show the nginx version number, a security best practice
-  root /home/git/gitlab/public;
+  root /usr/share/gitlab/public;
 
   ## See app/controllers/application_controller.rb for headers set
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/gitlab.git