Fix for Mailroom

Author: Dave Conroy

install/assets/functions/20-gitlab

@@ -377,7 +377,7 @@ gitlab_configure_mailroom() {
     IMAP_TIMEOUT
 
   # enable/disable startup of mailroom
-  print_notice "mail_room_enabled=${GITLAB_INCOMING_EMAIL_ENABLED}" >> /etc/default/gitlab
+  echo "mail_room_enabled=${GITLAB_INCOMING_EMAIL_ENABLED}" >> /etc/default/gitlab
   update_template /etc/services.available/60-mailroom/run GITLAB_INCOMING_EMAIL_ENABLED
 
   envsubst < /etc/services.available/60-mailroom/run > /etc/services.available/60-mailroom/run.tmp

install/etc/cont-init.d/20-gitlab

@@ -16,10 +16,6 @@ case "$MODE" in
         case "$MODE" in
             "START")
                 migrate_database
-                #        s6-svc -u /var/run/s6/services/20-puma
-                #        s6-svc -u /var/run/s6/services/30-gitaly
-                #        s6-svc -u /var/run/s6/services/40-sidekiq
-                #        s6-svc -u /var/run/s6/services/50-workhorse
                 ### Enable / Disable Services
                 if var_true $GITLAB_INCOMING_MAIL_ENABLED ; then
                     print_notice "Enabling Mailroom"

install/etc/services.available/60-mailroom/run

@@ -12,4 +12,4 @@ print_info "Starting Mailroom"
 HOME=${GITLAB_HOME}
 
 cd "${GITLAB_INSTALL_DIR}"
-silent exec s6-setuidgid git bundle exec mail_room "${GITLAB_INSTALL_DIR}"/config/mail_room.yml
+silent sudo -HEu git bundle exec mail_room ${GITLAB_INSTALL_DIR}/config/mail_room.yml