clean up config to use global settings

This commit is contained in:
Sam
2013-12-20 15:12:23 +11:00
parent 66afabcf4c
commit b312b4d563
4 changed files with 90 additions and 37 deletions

View File

@@ -1,8 +1,7 @@
defaults: &defaults
uri: <%= uri = URI.parse(ENV['REDIS_PROVIDER_URL'] || "redis://localhost:6379") %>
host: <%= uri.host %>
port: <%= uri.port %>
password: <%= uri.password %>
host: <%= GlobalSetting.redis_host %>
port: <%= GlobalSetting.redis_port %>
password: <%= GlobalSetting.redis_password %>
db: 0
cache_db: 2
@@ -20,4 +19,4 @@ staging:
<<: *defaults
production:
<<: *defaults
<<: *defaults