Make memory limits configurable and make them work with passenger

[rails.git] / config / application.yml

diff --git a/config/application.yml b/config/application.yml
index 7b2c603f087ae364e24123293dd238442caa0c6f..95037f83ecfc3f85a432273e051e38f04ae6dd9a 100644 (file)
--- a/config/application.yml
+++ b/config/application.yml
@@ -13,6 +13,8 @@ standard_settings: &standard_settings
   geonames_zoom: 12
   # Timeout for API calls in seconds
   api_timeout: 300
   geonames_zoom: 12
   # Timeout for API calls in seconds
   api_timeout: 300

+  # Timeout for web pages in seconds
+  web_timeout: 30

   # Periods (in hours) which are allowed for user blocks
   user_block_periods: [0, 1, 3, 6, 12, 24, 48, 96]
   # Rate limit for message sending
   # Periods (in hours) which are allowed for user blocks
   user_block_periods: [0, 1, 3, 6, 12, 24, 48, 96]
   # Rate limit for message sending


@@ -22,9 +24,14 @@ standard_settings: &standard_settings
   # Quova authentication details
   #quova_username: ""
   #quova_password: ""
   # Quova authentication details
   #quova_username: ""
   #quova_password: ""

+  # Spam threshold
+  spam_threshold: 50

   # Default legale (jurisdiction location) for contributor terms
   default_legale: GB
   # Default legale (jurisdiction location) for contributor terms
   default_legale: GB

- 
+  # Memory limits (in Mb)
+  #soft_memory_limit: 512
+  #hard_memory_limit: 2048 
+

 development:
   <<: *standard_settings
 
 development:
   <<: *standard_settings