Move socket files to /run and tmp folder to /var/lib/gitlab/tmp

Makefile

@@ -43,12 +43,12 @@ all: database-config resque-yml nginx-conf
 	cd /srv/gitlab && sed -e "s|/home/git/.ssh/|/srv/gitlab/.ssh/|" -i config/gitlab.yml
 	cd /srv/gitlab && sed -e "s|/home/git/repositories/|/var/lib/gitlab/repositories/|" -i config/gitlab.yml
 	cd /srv/gitlab && sed -e "s|/home/git|/srv|" -i config/gitlab.yml
+	cd /srv/gitlab && sed -e "s/\/srv\/gitlab\/tmp\/sockets\/private/\/run\/gitlab/" -i config/gitlab.yml
 	cd /srv/gitlab && sudo -u git -H cp config/secrets.yml.example config/secrets.yml
 	cd /srv/gitlab && chown -R git log/
-	cd /srv/gitlab && chown -R git tmp/
 	cd /srv/gitlab && chmod -R u+rwX,go-w log/
-	cd /srv/gitlab && chmod -R u+rwX tmp/
-	cd /srv/gitlab && chmod -R u+rwX tmp/sockets/
+	mv /srv/gitlab/tmp /var/lib/gitlab/tmp
+	ln -s /var/lib/gitlab/tmp /srv/gitlab/tmp
 	cd /srv/gitlab && sudo -u git -H mkdir -p public/uploads/
 	cd /srv/gitlab && chmod 0700 public/uploads
 	cd /srv/gitlab && chmod -R u+rwX builds/
@@ -57,6 +57,7 @@ all: database-config resque-yml nginx-conf
 	cd /srv/gitlab && sudo -u git -H mv config/puma.rb.example config/puma.rb
 	cd /srv/gitlab && sed -e "s|/home/git|/srv|" -i config/puma.rb
 	cd /srv/gitlab && sed -e "s|/srv/gitlab/tmp/pids|/run/gitlab|" -i config/puma.rb
+	cd /srv/gitlab && sed -e "s|/srv/gitlab/tmp/sockets|/run/gitlab|" -i config/puma.rb
 	cd /srv/gitlab && sed -e "s/\$$app_root\/tmp\/pids/\/run\/gitlab/" -i bin/*
 
 	@echo "$$DATABASE_CONFIG" > /srv/gitlab/config/database.yml
@@ -66,8 +67,9 @@ all: database-config resque-yml nginx-conf
 	@echo "$$RESQUE_YML" > /srv/gitlab/config/resque.yml
 	cd /srv/gitlab && chown -R git.git config/resque.yml
 	cd /srv/gitlab && sudo -u git -H chmod o-rwx config/resque.yml
-	
-	@echo "d /run/gitlab 755 git git -" > /usr/lib/tmpfiles.d/gitlab.conf
+
+	@echo "d /run/gitlab 0755 git git -" > /usr/lib/tmpfiles.d/gitlab.conf
+	@echo "d /run/gitaly 0700 git git -" > /usr/lib/tmpfiles.d/gitaly.conf
 
 	chmod o+w /srv
 	cd /srv/gitlab && sudo -u git -H HOME=$(CURDIR)/gitlab-home bundle install --deployment --without development test mysql aws kerberos
@@ -75,8 +77,8 @@ all: database-config resque-yml nginx-conf
 	cd /srv/gitlab && sudo -u git -H HOME=$(CURDIR)/gitlab-home PATH=$$PATH:$(CURDIR)/../go/go/bin GOCACHE=$(CURDIR)/gitlab-home/gocache bundle exec rake "gitlab:workhorse:install[/srv/gitlab-workhorse]" RAILS_ENV=production
 	cd /srv/gitlab && sudo -u git -H HOME=$(CURDIR)/gitlab-home PATH=$$PATH:$(CURDIR)/../go/go/bin GOCACHE=$(CURDIR)/gitlab-home/gocache VERBOSE=1 bundle exec rake "gitlab:gitaly:install[/srv/gitaly,/var/lib/gitlab/repositories]" RAILS_ENV=production
 	chmod o-w /srv
-	chmod 0700 /srv/gitlab/tmp/sockets/private
-	chown git /srv/gitlab/tmp/sockets/private
+	sed -e "s|/srv/gitaly/internal_sockets|/run/gitaly|" -i /srv/gitaly/config.toml
+	sed -e "s|/srv/gitlab/tmp/sockets/private|/run/gitlab|" -i /srv/gitaly/config.toml
 	cd /srv/gitlab && sudo -u git -H HOME=$(CURDIR)/gitlab-home bundle exec rake gettext:compile RAILS_ENV=production
 	cd /srv/gitlab && sudo -u git -H HOME=$(CURDIR)/gitlab-home yarn install --production --pure-lockfile
 	cd /srv/gitlab && sudo -u git -H HOME=$(CURDIR)/gitlab-home bundle exec rake gitlab:assets:compile RAILS_ENV=production NODE_ENV=production NODE_OPTIONS="--max-old-space-size=3072"
@@ -102,12 +104,14 @@ all: database-config resque-yml nginx-conf
 	@echo "$$NGINX_CONF" > /etc/nginx/nginx.conf
 	install -v -m644 /srv/gitlab/lib/support/nginx/gitlab /etc/nginx/gitlab.conf
 	sed -e "s|/home/git|/srv|" -i /etc/nginx/gitlab.conf
+	sed -e "s|/srv/gitlab/tmp/sockets|/run/gitlab|" -i /etc/nginx/gitlab.conf
 	sed -e "s/YOUR_SERVER_FQDN/_/" -i /etc/nginx/gitlab.conf
 	install -v -m755 /srv/gitlab/lib/support/init.d/gitlab /etc/init.d/gitlab
 	sed -e "s/redis-server/redis/" -i /etc/init.d/gitlab
 	install -v -m644 /srv/gitlab/lib/support/init.d/gitlab.default.example /etc/default/gitlab
 	sed -e "s/\/home\/\(\$$app_user\|git\)/\/srv/" -i /etc/default/gitlab
 	sed -e "s/\$$app_root\/tmp\/pids/\/run\/gitlab/" -i /etc/default/gitlab
+	sed -e "s/\$$app_root\/tmp\/sockets/\/run\/gitlab/" -i /etc/default/gitlab
 	systemctl enable gitlab.service
 
 	rm -rf /usr/local/share/.yarnrc