google imagery blacklist entry update

[rails.git] / config / settings.yml

diff --git a/config/settings.yml b/config/settings.yml
index ffee16114b480275517fb1942a697a9825853f15..316744f314450eaaaede7ce9037e8ffe0842a64c 100644 (file)
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -31,6 +31,8 @@ tracepoints_per_page: 5000
 max_number_of_nodes: 50000
 # Maximum number of nodes that can be in a way (checked on save)
 max_number_of_way_nodes: 2000
 max_number_of_nodes: 50000
 # Maximum number of nodes that can be in a way (checked on save)
 max_number_of_way_nodes: 2000

+# Maximum number of members that can be in a relation (checked on save)
+max_number_of_relation_members: 32000

 # The maximum area you're allowed to request notes from, in square degrees
 max_note_request_area: 25
 # Zoom level to use for postcode results from the geocoder
 # The maximum area you're allowed to request notes from, in square degrees
 max_note_request_area: 25
 # Zoom level to use for postcode results from the geocoder


@@ -63,9 +65,6 @@ spam_threshold: 50
 diary_feed_delay: 0
 # Default legale (jurisdiction location) for contributor terms
 default_legale: GB
 diary_feed_delay: 0
 # Default legale (jurisdiction location) for contributor terms
 default_legale: GB

-# Location of GPX traces and images
-gpx_trace_dir: "/home/osm/traces"
-gpx_image_dir: "/home/osm/images"

 # Location of data for attachments
 attachments_dir: ":rails_root/public/attachments"
 # Log file to use
 # Location of data for attachments
 attachments_dir: ":rails_root/public/attachments"
 # Log file to use


@@ -87,8 +86,8 @@ default_editor: "id"
 # Imagery to return in capabilities as blacklisted
 imagery_blacklist:
   # Current Google imagery URLs have google or googleapis in the domain
 # Imagery to return in capabilities as blacklisted
 imagery_blacklist:
   # Current Google imagery URLs have google or googleapis in the domain

-  # with a vt or kh endpoint, and x, y and z query parameters
-  - ".*\\.google(apis)?\\..*/(vt|kh)[\\?/].*([xyz]=.*){3}.*"
+  # with a vt or kh endpoint, and x, y and z or pb-based query parameters
+  - ".*\\.google(apis)?\\..*/(vt|kh)[\\?/].*([xyz]=.*|!\d[a-z]\d+){3}.*"

   # Blacklist VWorld
   - "http://xdworld\\.vworld\\.kr:8080/.*"
   # Blacklist here
   # Blacklist VWorld
   - "http://xdworld\\.vworld\\.kr:8080/.*"
   # Blacklist here


@@ -118,22 +117,23 @@ fossgis_osrm_url: "https://routing.openstreetmap.de/"
 csp_enforce: false
 # URL for reporting Content-Security-Policy violations
 #csp_report_url: ""
 csp_enforce: false
 # URL for reporting Content-Security-Policy violations
 #csp_report_url: ""

-# Storage service to use in production mode
-storage_service: "local"
-# Root URL for storage service
-# storage_url:
+# Storage services to use in production mode
+avatar_storage: "local"
+trace_file_storage: "local"
+trace_image_storage: "local"
+trace_icon_storage: "local"
+# Root URL for storage services
+# avatar_storage_url:
+# trace_image_storage_url:
+# trace_icon_storage_url:

 # URL for tile CDN
 #tile_cdn_url: ""
 # SMTP settings for outbound mail
 smtp_address: "localhost"
 smtp_port: 25
 smtp_domain: "localhost"
 # URL for tile CDN
 #tile_cdn_url: ""
 # SMTP settings for outbound mail
 smtp_address: "localhost"
 smtp_port: 25
 smtp_domain: "localhost"

-smtp_enable_starttls_auto: false
+smtp_enable_starttls_auto: true
+smtp_tls_verify_mode: "none"

 smtp_authentication: null
 smtp_user_name: null
 smtp_password: null
 smtp_authentication: null
 smtp_user_name: null
 smtp_password: null

-# Storage services
-avatar_storage: "local"
-trace_file_storage: "local"
-trace_image_storage: "local"
-trace_icon_storage: "local"