Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kirill Smelkov
slapos
Commits
da89a6b8
Commit
da89a6b8
authored
Nov 09, 2015
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
X git push works
parent
fd53d70e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
3 deletions
+6
-3
software/gitlab/instance-gitlab.cfg.in
software/gitlab/instance-gitlab.cfg.in
+4
-3
software/gitlab/instance.cfg.in
software/gitlab/instance.cfg.in
+1
-0
software/gitlab/software.cfg
software/gitlab/software.cfg
+1
-0
No files found.
software/gitlab/instance-gitlab.cfg.in
View file @
da89a6b8
...
...
@@ -77,7 +77,7 @@ git = {{ git }}
[publish-instance-info]
recipe = slapos.cookbook:publish
url
= ${backend-info:url}
backend_url
= ${backend-info:url}
...
...
@@ -228,6 +228,7 @@ context-extra =
# 3. bin/
# gitlab-<prog>
# XXX gitlabshell-prog ?
[gitlab-bin]
recipe = slapos.cookbook:wrapper
wrapper-path = ${directory:bin}/${:_buildout_section_name_}
...
...
@@ -432,9 +433,9 @@ command-line = {{ gitlab_workhorse }}
-authSocket ${unicorn:socket}
# 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 =
PATH={{ git_location }}/bin:%(PATH)s
PATH={{ git_location }}/bin:
{{ ruby_location }}/bin:
%(PATH)s
######################
...
...
software/gitlab/instance.cfg.in
View file @
da89a6b8
...
...
@@ -35,6 +35,7 @@ context =
raw git ${git:location}/bin/git
# XXX git vs git_location
raw git_location ${git:location}
raw ruby_location ${bundler-4gitlab:ruby-location}
raw nginx_bin ${nginx-output:nginx}
raw mime_types ${nginx-output:mime}
raw postgresql_location ${postgresql92:location}
...
...
software/gitlab/software.cfg
View file @
da89a6b8
...
...
@@ -15,6 +15,7 @@ extends =
parts =
python2.7
ruby2.1
golang15
git
postgresql92
redis28
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment