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
4457e2d5
Commit
4457e2d5
authored
Jul 16, 2015
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
X upgrade gitlab + found how to fix redis
https://github.com/redis-store/redis-store/pull/251
parent
d34a9129
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
5 deletions
+3
-5
software/gitlab/software.cfg
software/gitlab/software.cfg
+2
-2
software/gitlab/template/resque.yml.in
software/gitlab/template/resque.yml.in
+1
-3
No files found.
software/gitlab/software.cfg
View file @
4457e2d5
...
...
@@ -110,7 +110,7 @@ environment =
[gitlab-repository]
recipe = slapos.recipe.build:gitclone
repository = https://gitlab.com/gitlab-org/gitlab-ce.git
revision = v7.1
2.0.rc3-6-gbef405333c2527a78ef5c2f438000e822e39669d
revision = v7.1
3.0.rc2-0-gae44e5ec064aaa9f5063732dc7bb6ee751a80ce2
location = ${buildout:parts-directory}/gitlab
git-executable = ${git:location}/bin/git
...
...
@@ -118,7 +118,7 @@ git-executable = ${git:location}/bin/git
recipe = slapos.recipe.build:gitclone
repository = https://gitlab.com/gitlab-org/gitlab-shell.git
# FIXME pin gitlab-shell version properly (wrt gitlab) ?
revision = v2.6.3-
0-g4d30c0c
revision = v2.6.3-
5-ga338189
location = ${buildout:parts-directory}/gitlab-shell
git-executable = ${git:location}/bin/git
...
...
software/gitlab/template/resque.yml.in
View file @
4457e2d5
...
...
@@ -3,6 +3,4 @@
# https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/resque.yml.example
# https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/resque.yml.erb
#production: redis://[${request-redis:connection-redis_ip}]:${request-redis:connection-redis_port}
# XXX redis does not remove [] for host from [host]:port
production: redis://${request-redis:connection-redis_ip}:${request-redis:connection-redis_port}
production: redis://[${request-redis:connection-redis_ip}]:${request-redis:connection-redis_port}
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