From eb2b7608e1ffaa331030e9202431ff395d58624d Mon Sep 17 00:00:00 2001 From: iv <isabelle.vallet@nexedi.com> Date: Fri, 30 Sep 2016 09:03:08 +0000 Subject: [PATCH] gitlab: fix promise failure due to use of curl version 7.50 it is no longer possible to use http:/ as curl now expect a hostname to be given, see curl issue https://github.com/curl/curl/issues/936 --- software/gitlab/instance-gitlab.cfg.in | 4 ++-- software/gitlab/software.cfg | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/software/gitlab/instance-gitlab.cfg.in b/software/gitlab/instance-gitlab.cfg.in index 178f19d39..f94605af5 100644 --- a/software/gitlab/instance-gitlab.cfg.in +++ b/software/gitlab/instance-gitlab.cfg.in @@ -537,7 +537,7 @@ depend = [promise-gitlab-workhorse] <= promise-byurl -url = --unix-socket ${gitlab-workhorse:socket} http:/static.css +url = --unix-socket ${gitlab-workhorse:socket} http://localhost/static.css # gitlab-workhorse logs to stdout/stderr - logs are handled by slapos not us @@ -579,7 +579,7 @@ depend = [promise-unicorn] <= promise-byurl -url = --unix-socket ${unicorn:socket} http:/ +url = --unix-socket ${unicorn:socket} http://localhost/ [promise-rakebase] recipe = slapos.cookbook:wrapper diff --git a/software/gitlab/software.cfg b/software/gitlab/software.cfg index 48047aa69..e1af8da5b 100644 --- a/software/gitlab/software.cfg +++ b/software/gitlab/software.cfg @@ -248,7 +248,7 @@ md5sum = 176939a6428a7aca4767a36421b0af2b [instance-gitlab.cfg.in] <= download-file -md5sum = 2cc8f5b4cd5f09d4630d0390305c96ad +md5sum = 89914e4a225f6cdebfa196d46359f6f2 [macrolib.cfg.in] <= download-file -- 2.30.9