Merge branch 'master' into terms

[rails.git] / config / application.yml

diff --git a/config/application.yml b/config/application.yml
index a478217a40d1db39241bf7e57dfb7b36896ce8aa..d405709657166f85a59903e359d1da4269dbc199 100644 (file)
--- a/config/application.yml
+++ b/config/application.yml
@@ -11,14 +11,21 @@ standard_settings: &standard_settings
   postcode_zoom: 15
   # Zoom level to use for geonames results from the geocoder
   geonames_zoom: 12
   postcode_zoom: 15
   # Zoom level to use for geonames results from the geocoder
   geonames_zoom: 12

-  # Enable experimental "twain" geocoder
-  twain_enabled: false

   # Timeout for API calls in seconds
   api_timeout: 300
   # 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
   max_messages_per_hour: 60
   # Timeout for API calls in seconds
   api_timeout: 300
   # 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
   max_messages_per_hour: 60

+  # Domain for handling message replies
+  #messages_domain: "messages.openstreetmap.org"
+  # Quova authentication details
+  #quova_username: ""
+  #quova_password: ""
+  # Spam threshold
+  spam_threshold: 50
+  # Default legale (jurisdiction location) for contributor terms
+  default_legale: GB

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