Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-shell
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
gitlab-shell
Commits
57865ae2
Commit
57865ae2
authored
Sep 11, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #141 from attiks/support-redis-password
added support for redis password
parents
3f365414
38af3f1e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
config.yml.example
config.yml.example
+1
-0
lib/gitlab_config.rb
lib/gitlab_config.rb
+5
-1
No files found.
config.yml.example
View file @
57865ae2
...
@@ -29,6 +29,7 @@ redis:
...
@@ -29,6 +29,7 @@ redis:
bin: /usr/bin/redis-cli
bin: /usr/bin/redis-cli
host: 127.0.0.1
host: 127.0.0.1
port: 6379
port: 6379
# pass: redispass # Allows you to specify the password for Redis
# socket: /tmp/redis.socket # Only define this if you want to use sockets
# socket: /tmp/redis.socket # Only define this if you want to use sockets
namespace: resque:gitlab
namespace: resque:gitlab
...
...
lib/gitlab_config.rb
View file @
57865ae2
...
@@ -52,9 +52,13 @@ class GitlabConfig
...
@@ -52,9 +52,13 @@ class GitlabConfig
else
else
if
redis
.
has_key?
(
"socket"
)
if
redis
.
has_key?
(
"socket"
)
%W(
#{
redis
[
'bin'
]
}
-s
#{
redis
[
'socket'
]
}
)
%W(
#{
redis
[
'bin'
]
}
-s
#{
redis
[
'socket'
]
}
)
else
if
redis
.
has_key?
(
"pass"
)
%W(
#{
redis
[
'bin'
]
}
-h
#{
redis
[
'host'
]
}
-p
#{
redis
[
'port'
]
}
-a
#{
redis
[
'pass'
]
}
)
else
else
%W(
#{
redis
[
'bin'
]
}
-h
#{
redis
[
'host'
]
}
-p
#{
redis
[
'port'
]
}
)
%W(
#{
redis
[
'bin'
]
}
-h
#{
redis
[
'host'
]
}
-p
#{
redis
[
'port'
]
}
)
end
end
end
end
end
end
end
end
end
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