From 5d1565da3277c048bef7e826bc0519eb04af9755 Mon Sep 17 00:00:00 2001 From: Praveen Arimbrathodiyil Date: Mon, 15 Feb 2016 23:33:23 +0530 Subject: [PATCH] fix path for gitlab-workhorse --- debian/conf/gitlab-workhorse.service | 2 +- debian/conf/nginx.conf.example | 2 +- debian/conf/nginx.ssl.conf.example | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/conf/gitlab-workhorse.service b/debian/conf/gitlab-workhorse.service index 8f5561e57c..aec513377b 100644 --- a/debian/conf/gitlab-workhorse.service +++ b/debian/conf/gitlab-workhorse.service @@ -21,7 +21,7 @@ EnvironmentFile=/etc/gitlab/gitlab-debian.conf SyslogIdentifier=gitlab-workhorse PIDFile=/run/gitlab/gitlab-workhorse.pid -ExecStart=/usr/share/gitlab/bin/daemon_with_pidfile /run/gitlab/gitlab-workhorse.pid gitlab-workhorse -listenUmask 0 -listenNetwork unix -listenAddr /run/gitlab/sockets/gitlab-workhorse.socket -authBackend http://127.0.0.1:8080 -authSocket /run/gitlab/sockets/gitlab.socket -documentRoot /usr/share/gitlab/public >>/var/log/gitlab/gitlab-workhorse.log 2>&1 +ExecStart=/usr/share/gitlab/bin/daemon_with_pidfile /run/gitlab/gitlab-workhorse.pid gitlab-workhorse -listenUmask 0 -listenNetwork unix -listenAddr /run/gitlab/gitlab-workhorse.socket -authBackend http://127.0.0.1:8080 -authSocket /run/gitlab/gitlab.socket -documentRoot /usr/share/gitlab/public >>/var/log/gitlab/gitlab-workhorse.log 2>&1 [Install] WantedBy=multi-user.target diff --git a/debian/conf/nginx.conf.example b/debian/conf/nginx.conf.example index e5bac5db90..b966da7f5c 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:/var/run/gitlab/sockets/gitlab-workhorse.socket fail_timeout=0; + server unix:/run/gitlab/gitlab-workhorse.socket fail_timeout=0; } ## Normal HTTP host diff --git a/debian/conf/nginx.ssl.conf.example b/debian/conf/nginx.ssl.conf.example index 511138ab26..8822c483aa 100644 --- a/debian/conf/nginx.ssl.conf.example +++ b/debian/conf/nginx.ssl.conf.example @@ -21,7 +21,7 @@ ## See installation.md#using-https for additional HTTPS configuration details. upstream gitlab-workhorse { - server unix:/var/run/gitlab/sockets/gitlab-workhorse.socket fail_timeout=0; + server unix:/run/gitlab/gitlab-workhorse.socket fail_timeout=0; } ## Redirects all HTTP traffic to the HTTPS host