Commit da89a6b8 authored by Kirill Smelkov's avatar Kirill Smelkov

X git push works

parent fd53d70e
...@@ -77,7 +77,7 @@ git = {{ git }} ...@@ -77,7 +77,7 @@ git = {{ git }}
[publish-instance-info] [publish-instance-info]
recipe = slapos.cookbook:publish recipe = slapos.cookbook:publish
url = ${backend-info:url} backend_url = ${backend-info:url}
...@@ -228,6 +228,7 @@ context-extra = ...@@ -228,6 +228,7 @@ context-extra =
# 3. bin/ # 3. bin/
# gitlab-<prog> # gitlab-<prog>
# XXX gitlabshell-prog ?
[gitlab-bin] [gitlab-bin]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
wrapper-path = ${directory:bin}/${:_buildout_section_name_} wrapper-path = ${directory:bin}/${:_buildout_section_name_}
...@@ -432,9 +433,9 @@ command-line = {{ gitlab_workhorse }} ...@@ -432,9 +433,9 @@ command-line = {{ gitlab_workhorse }}
-authSocket ${unicorn:socket} -authSocket ${unicorn:socket}
# XXX for git to be available on path # XXX for git to be available on path
# XXX -> more general place? # XXX for ruby to be available on path (gitlab-workhorse -> gitlab-shell -> hooks on push)
environment = environment =
PATH={{ git_location }}/bin:%(PATH)s PATH={{ git_location }}/bin:{{ ruby_location }}/bin:%(PATH)s
###################### ######################
......
...@@ -35,6 +35,7 @@ context = ...@@ -35,6 +35,7 @@ context =
raw git ${git:location}/bin/git raw git ${git:location}/bin/git
# XXX git vs git_location # XXX git vs git_location
raw git_location ${git:location} raw git_location ${git:location}
raw ruby_location ${bundler-4gitlab:ruby-location}
raw nginx_bin ${nginx-output:nginx} raw nginx_bin ${nginx-output:nginx}
raw mime_types ${nginx-output:mime} raw mime_types ${nginx-output:mime}
raw postgresql_location ${postgresql92:location} raw postgresql_location ${postgresql92:location}
......
...@@ -15,6 +15,7 @@ extends = ...@@ -15,6 +15,7 @@ extends =
parts = parts =
python2.7 python2.7
ruby2.1 ruby2.1
golang15
git git
postgresql92 postgresql92
redis28 redis28
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment