Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonne Haß <me@mrzyx.de>2012-11-30 17:00:25 +0400
committerJonne Haß <me@mrzyx.de>2012-11-30 17:00:25 +0400
commit2a7a0b7b990b70835e336ddffe62bf0e4b198ac4 (patch)
tree8e2c85ff8d9ac6ebc1146d8332c80120028e0e76 /config/defaults.yml
parent669dd87b11b9b989848f5f0393037c97fb53b1ef (diff)
* made number of unicorn worker processes configurable
* made configuration loader indepenent of rails * corrected mismatch between example and default config (server.db/server.database)
Diffstat (limited to 'config/defaults.yml')
-rw-r--r--config/defaults.yml3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/defaults.yml b/config/defaults.yml
index 611f328cc..f75a930bf 100644
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -28,7 +28,8 @@ defaults:
server:
port: 3000
rails_environment: 'development'
- db: 'mysql'
+ database: 'mysql'
+ unicorn_worker: 2
embed_resque_worker: false
resque_workers: 1
privacy: