Merge branch 'restart_gitlab_pages' into 'master'

Restart gitlab pages when the version changes.

Depends on gitlab-org/gitlab-pages!5

Fixes gitlab-org/omnibus-gitlab#1213

See merge request !720
This commit is contained in:
Marin Jankovski 2016-04-14 14:18:01 +00:00
commit 922f76555a
2 changed files with 7 additions and 0 deletions

View File

@ -15,6 +15,7 @@ omnibus-gitlab repository.
- Enable Git LFS by default (Ben Bodenmiller) 22345799
- Updated how we detect when to update the :latest and :rc docker build tags cb3af445
- Disable automatic git gc 8ed13f4b
- Restart GitLab pages daemon on version change
- Add git-annex to the docker image
8.6.5

View File

@ -32,6 +32,12 @@ gitlab_pages_static_etc_dir = "/opt/gitlab/etc/gitlab-pages"
end
end
file File.join(working_dir, "VERSION") do
content VersionHelper.version("/opt/gitlab/embedded/bin/gitlab-pages -version")
notifies :restart, "service[gitlab-pages]"
end
runit_service 'gitlab-pages' do
options({
:log_directory => log_directory