Merge branch 'master' of github.com:gitlabhq/gitlab-recipes

init/systemd/README.md

@@ -39,5 +39,3 @@ Enable them to start at boot:
 * If you installed GitLab in other path than `/home/git/gitlab` change the service files accordingly.
 * `/etc/systemd/system/` have a higher precedence over  `/usr/lib/systemd/system`.
-
-* If you are running Gitlab 8.0-8.1, use `gitlab-git-http-server.service` instead of `gitlab-workhorse.service`.

init/systemd/gitlab-git-http.service

-#####################################################
-#
-# GitLab version    : 8.0 - 8.1
-# Contributors      : davispuh, mtorromeo, axilleas, boeserwolf91, Stefan Tatschner (rumpelsepp)
-# Downloaded from   : https://gitlab.com/gitlab-org/gitlab-recipes/tree/master/init/systemd
-#
-####################################################
-
-[Unit]
-Description=Gitlab Git HTTP Worker
-Requires=gitlab-unicorn.service
-Wants=gitlab-unicorn.service
-After=gitlab-unicorn.service
-
-[Service]
-Type=forking
-User=git
-WorkingDirectory=/home/git/gitlab-git-http-server
-SyslogIdentifier=gitlab-git-http-server
-PIDFile=/home/git/gitlab/tmp/pids/gitlab-git-http-server.pid
-
-ExecStart=/home/git/gitlab/bin/daemon_with_pidfile /home/git/gitlab/tmp/pids/gitlab-git-http-server.pid /home/git/gitlab-git-http-server/gitlab-git-http-server -listenUmask 0 -listenNetwork unix -listenAddr /home/git/gitlab/tmp/sockets/gitlab-git-http-server.socket -authBackend http://127.0.0.1:8080 /home/git/repositories >> /home/git/gitlab/log/gitlab-git-http-server.log 2>&1
-
-[Install]
-WantedBy=multi-user.target

init/systemd/gitlab-workhorse.service

@@ -19,7 +19,7 @@ WorkingDirectory=/home/git/gitlab-workhorse
 SyslogIdentifier=gitlab-workhorse
 PIDFile=/home/git/gitlab/tmp/pids/gitlab-workhorse.pid
-ExecStart=/home/git/gitlab/bin/daemon_with_pidfile /home/git/gitlab/tmp/pids/gitlab-workhorse.pid /home/git/gitlab-workhorse/gitlab-workhorse -listenUmask 0 -listenNetwork unix -listenAddr /home/git/gitlab/tmp/sockets/gitlab-workhorse.socket -authBackend http://127.0.0.1:8080 >> /home/git/gitlab/log/gitlab-workhorse.log 2>&1
+ExecStart=/home/git/gitlab/bin/daemon_with_pidfile /home/git/gitlab/tmp/pids/gitlab-workhorse.pid /home/git/gitlab-workhorse/gitlab-workhorse -listenUmask 0 -listenNetwork unix -listenAddr /home/git/gitlab/tmp/sockets/gitlab-workhorse.socket -authBackend http://127.0.0.1:8080 -authSocket /home/git/gitlab/tmp/sockets/gitlab.socket -documentRoot /home/git/gitlab/public >> /home/git/gitlab/log/gitlab-workhorse.log 2>&1
 [Install]
 WantedBy=multi-user.target