zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-25 09:42:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:neocities/neocities

Browse source
This commit is contained in:
Kyle Drake 2016-12-10 19:43:53 -06:00
commit 55729d8737
3 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
config.yml.template
View file

@ -1,6 +1,7 @@
development: development:
database: 'postgres://localhost/neocities' database: 'postgres://localhost/neocities'
database_pool: 1 database_pool: 1
redis_url: "redis://localhost"
session_secret: "SECRET GOES HERE" session_secret: "SECRET GOES HERE"
recaptcha_public_key: "6LdSMScTAAAAAADhP4IDb5s_EN1qMmvNmrUXReE-" recaptcha_public_key: "6LdSMScTAAAAAADhP4IDb5s_EN1qMmvNmrUXReE-"
recaptcha_private_key: "6LdSMScTAAAAAIZAvP_W9d8fMsVT3iBX5wCwGvqV" recaptcha_private_key: "6LdSMScTAAAAAIZAvP_W9d8fMsVT3iBX5wCwGvqV"

1
config.yml.travis
View file

@ -1,5 +1,6 @@
database: 'postgres://postgres@localhost/travis_ci_test' database: 'postgres://postgres@localhost/travis_ci_test'
database_pool: 1 database_pool: 1
redis_url: redis://localhost
session_secret: 's3cr3t' session_secret: 's3cr3t'
recaptcha_public_key: '1234' recaptcha_public_key: '1234'
recaptcha_private_key: '5678' recaptcha_private_key: '5678'

2
environment.rb
View file

@ -65,7 +65,7 @@ end
if ENV['RACK_ENV'] == 'test' if ENV['RACK_ENV'] == 'test'
$redis = MockRedis.new $redis = MockRedis.new
else else
$redis = Redis.new $redis = Redis.new url: $config['redis_url']
end end
$redis_cache = Redis::Namespace.new :cache, redis: $redis $redis_cache = Redis::Namespace.new :cache, redis: $redis