Commit 02124edb authored by Sean McGivern's avatar Sean McGivern

Merge branch 'remove-redis-cli' into 'master'

Remove unused redis bin configuration.

Closes #114

See merge request gitlab-org/gitlab-shell!177
parents 5a9245e0 516bf4a9
v5.10.3
- Remove unused redis bin configuration
v5.10.2 v5.10.2
- Print redirection message when pushing into renamed project - Print redirection message when pushing into renamed project
......
...@@ -37,7 +37,6 @@ auth_file: "/home/git/.ssh/authorized_keys" ...@@ -37,7 +37,6 @@ auth_file: "/home/git/.ssh/authorized_keys"
# Redis settings used for pushing commit notices to gitlab # Redis settings used for pushing commit notices to gitlab
redis: redis:
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 # pass: redispass # Allows you to specify the password for Redis
......
redis: redis:
bin: /usr/bin/redis-cli
host: 127.0.1.1 host: 127.0.1.1
port: 6378 port: 6378
pass: secure pass: secure
......
...@@ -10,7 +10,6 @@ describe GitlabConfig do ...@@ -10,7 +10,6 @@ describe GitlabConfig do
config.instance_variable_set(:@config, YAML.load(config_file)) config.instance_variable_set(:@config, YAML.load(config_file))
end end
it { config.redis['bin'].should eq('/usr/bin/redis-cli') }
it { config.redis['host'].should eq('127.0.1.1') } it { config.redis['host'].should eq('127.0.1.1') }
it { config.redis['port'].should eq(6378) } it { config.redis['port'].should eq(6378) }
it { config.redis['database'].should eq(1) } it { config.redis['database'].should eq(1) }
......
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