Put all volatile files into /var/lib/gitlab and logs into /var/log/gitlab

Makefile

-all: database-config resque-yml nginx-conf
+all: database-config resque-yml nginx-conf logrotate-conf
 	rm /etc/passwd
 	mv -v /data/etc/passwd /etc/passwd
 	rm /etc/group
@@ -34,6 +34,10 @@ all: database-config resque-yml nginx-conf
 
 	install -v -m755 -d /srv/gitlab -o git -g git
 	install -v -m755 -d /var/lib/gitlab -o git -g git
+	install -v -m700 -d /var/lib/gitlab/.ssh -o git -g git
+	install -v -m755 -d /var/lib/gitlab/config -o git -g git
+	install -v -m755 -d /var/lib/gitlab/public -o git -g git
+	install -v -m755 -d /var/log/gitlab -o git -g git
 
 	sudo -u git -H tar xf gitlab-foss-v13.1.0.tar.bz2 -C /srv/gitlab --strip-components=1
 	sudo -u git -H patch -Np1 -d /srv/gitlab < gitlab-foss-v13.1.0-gems_update.patch
@@ -43,7 +47,7 @@ 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 && 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 && chmod -R u+rwX,go-w log/
@@ -56,7 +60,9 @@ all: database-config resque-yml nginx-conf
 	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|/srv/gitlab/log|/var/log/gitlab|" -i config/puma.rb
 	cd /srv/gitlab && sed -e "s/\$$app_root\/tmp\/pids/\/run\/gitlab/" -i bin/*
+	cd /srv/gitlab && sed -e "s/\$$app_root\/log/\/var\/log\/gitlab/" -i bin/*
 
 	@echo "$$DATABASE_CONFIG" > /srv/gitlab/config/database.yml
 	cd /srv/gitlab && chown -R git.git config/database.yml
@@ -69,12 +75,7 @@ all: database-config resque-yml nginx-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
 
-	mv -v /srv/gitlab/.ssh /var/lib/gitlab/.ssh
 	ln -sv /var/lib/gitlab/.ssh /srv/gitlab/.ssh
-	mv -v /srv/gitlab/shared /var/lib/gitlab/shared
-	ln -sv /var/lib/gitlab/shared /srv/gitlab/shared
-	mv -v /srv/gitlab/tmp /var/lib/gitlab/tmp
-	ln -sv /var/lib/gitlab/tmp /srv/gitlab/tmp
 
 	chmod o+w /srv
 	cd /srv/gitlab && sudo -u git -H HOME=$(CURDIR)/gitlab-home bundle install --deployment --without development test mysql aws kerberos
@@ -82,6 +83,7 @@ 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
+	echo 'log_file: "/var/log/gitlab/gitlab-shell.log"' >> /srv/gitlab-shell/config.yml
 	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
@@ -89,7 +91,8 @@ all: database-config resque-yml nginx-conf
 	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"
 
 	sudo -u git /usr/bin/redis-server /etc/redis/redis.conf --daemonize yes --supervised no
-	install -v -m775 -o git -g git -d /run/gitlab
+	install -v -m755 -o git -g git -d /run/gitlab
+	install -v -m700 -o git -g git -d /run/gitaly
 	install -v -m775 -o postgres -g postgres -d /run/postgresql
 	sudo -u postgres /usr/bin/pg_ctl -s -D /srv/pgsql/data start -w -t 120
 	sudo -u postgres psql -d template1 -c "CREATE USER git CREATEDB;"
@@ -104,9 +107,8 @@ all: database-config resque-yml nginx-conf
 	sudo -u postgres /usr/bin/pg_ctl -s -D /srv/pgsql/data stop -m fast
 	sudo -u git /usr/bin/redis-cli shutdown nosave
 
-	install -v -m644 /srv/gitlab/lib/support/logrotate/gitlab /etc/logrotate.d/gitlab
-	sed -e "s|/home/git|/srv|" -i /etc/logrotate.d/gitlab
 	@echo "$$NGINX_CONF" > /etc/nginx/nginx.conf
+	@echo "$$LOGROTATE_CONF" > /etc/logrotate.d/gitlab
 	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
@@ -117,6 +119,7 @@ all: database-config resque-yml nginx-conf
 	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
+	sed -e "s/\$$app_root\/log/\/var\/log\/gitlab/" -i /etc/default/gitlab
 	systemctl enable gitlab.service
 
 	rm -rf /usr/local/share/.yarnrc
@@ -141,6 +144,19 @@ all: database-config resque-yml nginx-conf
 	sudo -u git -H git config --global receive.advertisePushOptions true
 	sudo -u git -H git config --global core.fsyncObjectFiles true
 
+	mv -v /srv/gitlab/builds /var/lib/gitlab/builds
+	ln -sv /var/lib/gitlab/builds /srv/gitlab/builds
+	mv -v /srv/gitlab/config/secrets.yml /var/lib/gitlab/config/secrets.yml
+	ln -sv /var/lib/gitlab/config/secrets.yml /srv/gitlab/config/secrets.yml
+	rm -rf /srv/gitlab/log
+	ln -sv /var/log/gitlab /srv/gitlab/log
+	mv -v /srv/gitlab/public/uploads /var/lib/gitlab/public/uploads
+	ln -sv /var/lib/gitlab/public/uploads /srv/gitlab/public/uploads
+	mv -v /srv/gitlab/shared /var/lib/gitlab/shared
+	ln -sv /var/lib/gitlab/shared /srv/gitlab/shared
+	mv -v /srv/gitlab/tmp /var/lib/gitlab/tmp
+	ln -sv /var/lib/gitlab/tmp /srv/gitlab/tmp
+
 	rm -rf gitlab-home
 	umount /tmp
 	rm -rf tmp
@@ -186,3 +202,16 @@ http {
 }
 endef
 export NGINX_CONF
+
+logrotate-conf:
+define LOGROTATE_CONF
+/var/log/gitlab/*.log {
+    daily
+    missingok
+    rotate 90
+    compress
+    notifempty
+    copytruncate
+}
+endef
+export LOGROTATE_CONF