Merge branch 'workhorse-redis' into 'master'

Pass redis config to workhorse

See merge request !267

.gitignore

@@ -51,3 +51,5 @@
 /.gdk-install-root
 /builds
 /gitaly/
+/gitlab-workhorse/config.toml
+/gitlab-workhorse/.cache

Makefile

@@ -184,7 +184,10 @@ localhost.key:
 	openssl req -new -subj "/CN=localhost/" -x509 -days 365 -newkey rsa:2048 -nodes -keyout "localhost.key" -out "localhost.crt"
 	chmod 600 $@
-gitlab-workhorse-setup: gitlab-workhorse/bin/gitlab-workhorse
+gitlab-workhorse-setup: gitlab-workhorse/bin/gitlab-workhorse gitlab-workhorse/config.toml
+
+gitlab-workhorse/config.toml:
+	sed "s|/home/git|${gitlab_development_root}|" $@.example > $@
 gitlab-workhorse-update:	${gitlab_workhorse_clone_dir}/.git gitlab-workhorse/.git/pull gitlab-workhorse-clean-bin gitlab-workhorse/bin/gitlab-workhorse

Procfile.example

@@ -6,7 +6,7 @@ redis: exec redis-server /home/git/redis/redis.conf
 postgresql: exec support/postgresql-signal-wrapper postgres -D /home/git/postgresql/data -k /home/git/postgresql -h ''
 #postgresql-replica: exec support/postgresql-signal-wrapper postgres -D /home/git/postgresql-replica/data -k /home/git/postgresql-replica -h ''
 #openldap: exec support/exec-cd gitlab-openldap libexec/slapd -F slapd.d -d2 -h "ldap://$host:3890"
-gitlab-workhorse: exec /usr/bin/env PATH="/home/git/gitlab-workhorse/bin:$PATH" gitlab-workhorse -authSocket /home/git/gitlab.socket -listenAddr $host:$port -documentRoot /home/git/gitlab/public -developmentMode -secretPath /home/git/gitlab/.gitlab_workhorse_secret
+gitlab-workhorse: exec /usr/bin/env PATH="/home/git/gitlab-workhorse/bin:$PATH" gitlab-workhorse -authSocket /home/git/gitlab.socket -listenAddr $host:$port -documentRoot /home/git/gitlab/public -developmentMode -secretPath /home/git/gitlab/.gitlab_workhorse_secret -config /home/git/gitlab-workhorse/config.toml
 rails-web: exec /usr/bin/env RAILS_ENV=development support/exec-cd gitlab bin/web start_foreground
 rails-background-jobs: exec /usr/bin/env SIDEKIQ_LOG_ARGUMENTS=1 RAILS_ENV=development support/exec-cd gitlab bin/background_jobs start_foreground
 #influxdb: exec influxdb/bin/influxd -config influxdb/influxdb.conf

gitlab-workhorse/config.toml.example

+[redis]
+URL = "unix:///home/git/redis/redis.socket"