summaryrefslogtreecommitdiff
path: root/pld.patch
diff options
context:
space:
mode:
authorElan Ruusamäe2017-11-11 15:17:28 (GMT)
committerElan Ruusamäe2017-11-11 15:17:28 (GMT)
commit7cfd4c0b32bc55d36f0b7f833a2a152ae0f5ca10 (patch)
tree22c79983625584856633ebd39b155386c721fd05 /pld.patch
parentdc5bfeed4ec8d9572b79efc1cdbf6aa90efc7bf3 (diff)
downloadgitlab-ce-7cfd4c0b32bc55d36f0b7f833a2a152ae0f5ca10.zip
gitlab-ce-7cfd4c0b32bc55d36f0b7f833a2a152ae0f5ca10.tar.gz
fix user detect in background_jobs
it checks for file owner of config.ru, which is root in our packaging. duh
Diffstat (limited to 'pld.patch')
-rw-r--r--pld.patch11
1 files changed, 11 insertions, 0 deletions
diff --git a/pld.patch b/pld.patch
index 668937f..8a1c616 100644
--- a/pld.patch
+++ b/pld.patch
@@ -97,3 +97,14 @@
# host: localhost
# socket: /tmp/mysql.sock
+--- gitlab-ce-10.1.2/bin/background_jobs~ 2017-11-08 11:49:53.000000000 +0200
++++ gitlab-ce-10.1.2/bin/background_jobs 2017-11-11 17:17:02.489424129 +0200
+@@ -5,7 +5,7 @@
+ sidekiq_pidfile="$app_root/tmp/pids/sidekiq.pid"
+ sidekiq_logfile="$app_root/log/sidekiq.log"
+ sidekiq_config="$app_root/config/sidekiq_queues.yml"
+-gitlab_user=$(ls -l config.ru | awk '{print $3}')
++gitlab_user=git
+
+ warn()
+ {