Merge tag 'debian/12.8.8-6' into buster-fasttrack

gitlab Debian release 12.8.8-6
This commit is contained in:
Pirate Praveen 2020-04-04 16:19:28 +05:30
commit 199c725982
3 changed files with 13 additions and 0 deletions

8
debian/changelog vendored
View file

@ -1,3 +1,11 @@
gitlab (12.8.8-6) experimental; urgency=medium
* Start nginx after letsencrypt configuration
* Drop dependency on libjs-pdf (not needed anymore)
* Remove obsolete initializer: active_record_becomes.rb (Closes: #955732)
-- Pirate Praveen <praveen@debian.org> Sat, 04 Apr 2020 16:11:16 +0530
gitlab (12.8.8-5+fto10+2) buster-fasttrack; urgency=medium
* Drop dependency on libjs-pdf (not needed anymore)

View file

@ -228,6 +228,10 @@ case "$1" in
echo "Stop your webserver and try running letsencrypt manually..."
echo "$LETSENCRYPT_CMD"
}
if command -v nginx > /dev/null; then
echo "Starting nginx (letsencrypt configuration completed) ..."
invoke-rc.d nginx start
fi
fi
fi
else

1
debian/maintscript vendored
View file

@ -36,3 +36,4 @@ rm_conffile /etc/gitlab/initializers/pages.rb 12.3.9-1+fto10+1 gitlab
rm_conffile /etc/gitlab/initializers/rack_attack_git_basic_auth.rb 12.5.4-2+fto10+2 gitlab
rm_conffile /etc/gitlab/initializers/active_record_query_cache.rb 12.6.8-1+fto10+1 gitlab
rm_conffile /etc/gitlab/initializers/correlation_id.rb 12.6.8-1+fto10+1 gitlab
rm_conffile /etc/gitlab/initializers/active_record_becomes.rb 12.6.8-1+fto10+1 gitlab