diff options
| author | vollnhals <lion.vollnhals@googlemail.com> | 2013-10-29 18:02:01 +0100 |
|---|---|---|
| committer | Lion Vollnhals <lion@giantmonkey.de> | 2013-10-30 17:11:56 +0100 |
| commit | 67c18aa9419e59f1e6907d8068a6f48e2fcef48d (patch) | |
| tree | 9ba4038d2378673e8be05aa08ddcabdad90e95b0 /config | |
| parent | ee0e9830c1c1e4c54fd0b18fadef50f76c3680a4 (diff) | |
| download | gitlab-ce-67c18aa9419e59f1e6907d8068a6f48e2fcef48d.tar.gz | |
Respect the configured redis URL when initializing the session store
It was not possible to start Gitlab with a redis server running on another host or port. Every other subsystem that uses redis respects the settings in config/resque.yml.
This patch uses the configured url from the cache_store configuration.
The cache_store configuration already loads the correct redis url from config/resque.yml.
Closes #5406
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/session_store.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index 501cad4a838..467f9477392 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -2,6 +2,7 @@ Gitlab::Application.config.session_store( :redis_store, # Using the cookie_store would enable session replay attacks. + servers: Gitlab::Application.config.cache_store.last, # re-use the Redis config from the Rails cache store key: '_gitlab_session', secure: Gitlab::Application.config.force_ssl, httponly: true, |