diff --git a/software/gitlab/instance-gitlab.cfg.in b/software/gitlab/instance-gitlab.cfg.in index c6117e4ad03306560125183267ee63fea94c4fdb..381723bdf7d544c67b5d98db0f9e752733bb938e 100644 --- a/software/gitlab/instance-gitlab.cfg.in +++ b/software/gitlab/instance-gitlab.cfg.in @@ -326,6 +326,13 @@ tune-command = recipe = slapos.cookbook:wrapper wrapper-path = !py! '${directory:promise}/' + '${:_buildout_section_name_}'[8:] +# [promise-<something>] to check <something> by url +[promise-byurl] +recipe = slapos.cookbook:check_url_available +path = !py! '${directory:promise}/' + '${:_buildout_section_name_}'[8:] +dash_path = {{ bash_bin }} +curl_path = {{ curl_bin }} +http_code = 200 diff --git a/software/gitlab/instance.cfg.in b/software/gitlab/instance.cfg.in index 31913bc1986c8f10152a9eb5d8e0b27c4b7a9338..aad1d7fe60b2b936b43d7d29da934c0d511ffc72 100644 --- a/software/gitlab/instance.cfg.in +++ b/software/gitlab/instance.cfg.in @@ -30,7 +30,9 @@ context = raw gitlab_shell_repository_location ${gitlab-shell-repository:location} # program binaries + raw bash_bin ${bash:location}/bin/bash raw bundler_4gitlab ${bundler-4gitlab:bundle} + raw curl_bin ${curl:location}/bin/curl raw dcron_bin ${dcron-output:crond} raw git ${git:location}/bin/git raw gunzip_bin ${gzip:location}/bin/gunzip diff --git a/software/gitlab/software.cfg b/software/gitlab/software.cfg index a662d1d3c74b6012e5e357ac3737a90f4d5d8e35..22fc5b3f28947bb5a55b909ee169aaf115e79613 100644 --- a/software/gitlab/software.cfg +++ b/software/gitlab/software.cfg @@ -14,6 +14,8 @@ extends = ../../component/nginx/buildout.cfg # for instance + ../../component/bash/buildout.cfg + ../../component/curl/buildout.cfg ../../component/gzip/buildout.cfg ../../component/dcron/buildout.cfg ../../component/logrotate/buildout.cfg @@ -39,6 +41,8 @@ parts = slapos-cookbook eggs + bash + curl gzip dcron-output logrotate