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

Merge branch 'master' into v2

Browse source
This commit is contained in:
Kyle Drake 2014-04-30 19:46:01 -07:00
commit cf6bf7f031
4 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -20,3 +20,5 @@ config.yml
.DS_Store .DS_Store
public/assets/css/.sass-cache/ public/assets/css/.sass-cache/
public/site_thumbnails public/site_thumbnails
public/sites
public/site_screenshots

7
environment.rb
View file

@ -37,12 +37,15 @@ end
Sidekiq::Logging.logger = nil unless ENV['RACK_ENV'] == 'production' Sidekiq::Logging.logger = nil unless ENV['RACK_ENV'] == 'production'
sidekiq_redis_config = {namespace: 'neocitiesworker'}
sidekiq_redis_config[:url] = $config['sidekiq_url'] if $config['sidekiq_url']
Sidekiq.configure_server do |config| Sidekiq.configure_server do |config|
config.redis = { namespace: 'neocitiesworker' } config.redis = sidekiq_redis_config
end end
Sidekiq.configure_client do |config| Sidekiq.configure_client do |config|
config.redis = { namespace: 'neocitiesworker' } config.redis = sidekiq_redis_config
end end
require File.join(DIR_ROOT, 'workers', 'thumbnail_worker.rb') require File.join(DIR_ROOT, 'workers', 'thumbnail_worker.rb')

1
public/site_screenshots/.gitignore vendored
View file

@ -1 +0,0 @@
*

1
public/sites/.gitignore vendored
View file

@ -1 +0,0 @@
*