Merge remote-tracking branch 'upstream/pull/4921'

[rails.git] / config / settings.yml

diff --git a/config/settings.yml b/config/settings.yml
index c057be978a841485174d6714ea3499744011fd2e..fa7207721c9dd28db5ce5c35281f60e7a20f3227 100644 (file)
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -73,6 +73,13 @@ max_changes_per_hour: 100000
 days_to_max_changes: 7
 importer_changes_per_hour: 1000000
 moderator_changes_per_hour: 1000000
 days_to_max_changes: 7
 importer_changes_per_hour: 1000000
 moderator_changes_per_hour: 1000000

+# Size limit for changes
+min_size_limit: 10000000
+initial_size_limit: 30000000
+max_size_limit: 5400000000
+days_to_max_size_limit: 28
+importer_size_limit: 5400000000
+moderator_size_limit: 5400000000

 # Domain for handling message replies
 #messages_domain: "messages.openstreetmap.org"
 # MaxMind GeoIPv2 database
 # Domain for handling message replies
 #messages_domain: "messages.openstreetmap.org"
 # MaxMind GeoIPv2 database


@@ -97,9 +104,12 @@ attachments_dir: ":rails_root/public/attachments"
 #memcache_servers: []
 # Enable HTTP basic authentication support
 basic_auth_support: true
 #memcache_servers: []
 # Enable HTTP basic authentication support
 basic_auth_support: true

+# Enable OAuth 1.0/1.0a registration
+oauth_10_registration: true

 # Enable legacy OAuth 1.0 support
 oauth_10_support: true
 # Enable legacy OAuth 1.0 support
 oauth_10_support: true

-oauth_10_registration: true
+# Enable OAuth 1.0a support
+oauth_10a_support: true

 # URL of Nominatim instance to use for geocoding
 nominatim_url: "https://nominatim.openstreetmap.org/"
 # Default editor
 # URL of Nominatim instance to use for geocoding
 nominatim_url: "https://nominatim.openstreetmap.org/"
 # Default editor