Merge branch 'master' into terms

[rails.git] / config / application.yml

diff --git a/config/application.yml b/config/application.yml
index fce78a364456000025649cba580f17fb898fd0b4..d405709657166f85a59903e359d1da4269dbc199 100644 (file)
--- a/config/application.yml
+++ b/config/application.yml
@@ -11,8 +11,6 @@ standard_settings: &standard_settings
   postcode_zoom: 15
   # Zoom level to use for geonames results from the geocoder
   geonames_zoom: 12
-  # Enable experimental nominatim geocoder
-  nominatim_enabled: false
   # Timeout for API calls in seconds
   api_timeout: 300
   # Periods (in hours) which are allowed for user blocks
@@ -21,6 +19,13 @@ standard_settings: &standard_settings
   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