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
26431a11
Commit
26431a11
authored
Nov 13, 2015
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
X Redis checks ok
parent
bb897909
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
software/gitlab/instance-gitlab.cfg.in
software/gitlab/instance-gitlab.cfg.in
+1
-2
software/gitlab/software.cfg
software/gitlab/software.cfg
+2
-1
No files found.
software/gitlab/instance-gitlab.cfg.in
View file @
26431a11
...
@@ -280,9 +280,8 @@ recipe = slapos.cookbook:wrapper
...
@@ -280,9 +280,8 @@ recipe = slapos.cookbook:wrapper
wrapper-path = ${directory:bin}/${:_buildout_section_name_}
wrapper-path = ${directory:bin}/${:_buildout_section_name_}
# NOTE HOME needed to pick gitconfig
# NOTE HOME needed to pick gitconfig
environment =
environment =
BUNDLE_GEMFILE = {{ gitlab_repository_location
+ '/Gemfile' }}
BUNDLE_GEMFILE = {{ gitlab_repository_location
}}/Gemfile
HOME = ${directory:home}
HOME = ${directory:home}
# PATH = ... TODO
RAILS_ENV = production
RAILS_ENV = production
# XXX here vvv ?
# XXX here vvv ?
SIDEKIQ_MEMORY_KILLER_MAX_RSS = 1000000
SIDEKIQ_MEMORY_KILLER_MAX_RSS = 1000000
...
...
software/gitlab/software.cfg
View file @
26431a11
...
@@ -69,9 +69,10 @@ bundle = ${buildout:bin-directory}/bundle
...
@@ -69,9 +69,10 @@ bundle = ${buildout:bin-directory}/bundle
# Rugged needs: cmake, pkgconfig
# Rugged needs: cmake, pkgconfig
# execjs needs: nodejs
# execjs needs: nodejs
# rails needs db client program on path: psql
# rails needs db client program on path: psql
# gitlab wants to check redis version via running: redis-cli
#
#
environment =
environment =
PATH = ${:ruby-location}/bin:${cmake:location}/bin:${pkgconfig:location}/bin:${nodejs:location}/bin:${postgresql92:location}/bin:%(PATH)s
PATH = ${:ruby-location}/bin:${cmake:location}/bin:${pkgconfig:location}/bin:${nodejs:location}/bin:${postgresql92:location}/bin:
${redis28:location}/bin:
%(PATH)s
...
...
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