summarylogtreecommitdiffstats
path: root/gitlab-mailroom.service
diff options
context:
space:
mode:
authorCaleb Maclennan2019-04-08 08:18:53 +0300
committerCaleb Maclennan2019-04-08 08:26:09 +0300
commit10dfb68ea26a03c1e47069f7b87a92547c4f529d (patch)
tree3d9b8d8d23bdb07130f08b5bcabf60286936aa4b /gitlab-mailroom.service
parenteefbf2797680b9fa414c5ef08482974f6140964e (diff)
downloadaur-10dfb68ea26a03c1e47069f7b87a92547c4f529d.tar.gz
Update to 11.9.6, track edits from [community]/gitlab
Diffstat (limited to 'gitlab-mailroom.service')
-rw-r--r--gitlab-mailroom.service5
1 files changed, 3 insertions, 2 deletions
diff --git a/gitlab-mailroom.service b/gitlab-mailroom.service
index b3c50050570d..54f139944425 100644
--- a/gitlab-mailroom.service
+++ b/gitlab-mailroom.service
@@ -9,10 +9,11 @@ StartLimitIntervalSec=100s
User=gitlab
Group=gitlab
WorkingDirectory=<DATADIR>
-Environment=RAILS_ENV=production PATH=/opt/ruby2.3/bin:/usr/bin
+# Prevent ExecJS from complaining that Node is not installed in production
+Environment=RAILS_ENV=production PATH=/opt/ruby2.5/bin:/usr/bin EXECJS_RUNTIME=Disabled
SyslogIdentifier=gitlab-mailroom
PIDFile=/run/gitlab/mailroom.pid
-ExecStart=/usr/bin/bundle-2.3 exec mail_room -q -c <DATADIR>/config/mail_room.yml
+ExecStart=/usr/bin/bundle-2.5 exec mail_room -q -c <DATADIR>/config/mail_room.yml
ExecStop=/usr/bin/kill -QUIT $MAINPID
Restart=on-failure
RestartSec=1