diff --git a/debian/changelog b/debian/changelog index 6e8676d4be..def580d7cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,17 @@ -gitlab (10.7.5+dfsg-2~bpo9+1) stretch-backports; urgency=medium +gitlab (10.7.5+dfsg-3~bpo9+1) stretch-backports; urgency=medium * Rebuild for stretch-backports. -- Pirate Praveen Sun, 03 Jun 2018 21:03:45 +0530 +gitlab (10.7.5+dfsg-3) experimental; urgency=medium + + * Relax ruby version check (2.3.3 includes security fixes) + * Add gitlab-common binary to handle user creation for gitlab and gitaly + (Closes: #901310) + + -- Pirate Praveen Wed, 13 Jun 2018 10:57:34 +0530 + gitlab (10.7.5+dfsg-2) experimental; urgency=medium * Bump minimum version of gitlab-workhorse to 4.1.0 diff --git a/debian/conf/gitlab b/debian/conf/gitlab index 9918667d2a..651b242a7e 100755 --- a/debian/conf/gitlab +++ b/debian/conf/gitlab @@ -9,6 +9,7 @@ RAILS_ENV="production" # Read debian specific configuration . /etc/gitlab/gitlab-debian.conf +. /etc/gitlab-common/gitlab-common.conf for i in $(grep -v '#' /etc/gitlab/gitlab-debian.conf | cut -d= -f 1) do @@ -17,7 +18,7 @@ done # app_user defines the user that GitLab is run as. # The default is "git". -app_user=${gitlab_user} +export app_user=${gitlab_user} # app_root defines the folder in which gitlab and it's components are installed. # The default is "/home/$app_user/gitlab"