Move the api trace methods into a separate controller under the api namespace

[rails.git] / config / example.application.yml

diff --git a/config/example.application.yml b/config/example.application.yml
index 9234099b774005a37fb934129e9804dd77ba880b..8596e10cc26fa8fe16c8850f3950f5673e3e8f0a 100644 (file)
--- a/config/example.application.yml
+++ b/config/example.application.yml
@@ -1,16 +1,19 @@
 defaults: &defaults
 defaults: &defaults

-  # The server URL
-  server_url: "www.openstreetmap.org"
+  # The server protocol and host
+  server_protocol: "http"
+  server_url: "openstreetmap.example.com"
+  # Publisher
+  #publisher_url: ""

   # The generator
   generator: "OpenStreetMap server"
   copyright_owner: "OpenStreetMap and contributors"
   attribution_url: "http://www.openstreetmap.org/copyright"
   license_url: "http://opendatacommons.org/licenses/odbl/1-0/"
   # Support email address
   # The generator
   generator: "OpenStreetMap server"
   copyright_owner: "OpenStreetMap and contributors"
   attribution_url: "http://www.openstreetmap.org/copyright"
   license_url: "http://opendatacommons.org/licenses/odbl/1-0/"
   # Support email address

-  support_email: support@openstreetmap.org
+  support_email: "openstreetmap@example.com"

   # Sender addresses for emails
   # Sender addresses for emails

-  email_from: "OpenStreetMap <support@openstreetmap.org>"
-  email_return_path: "bounces@openstreetmap.org"
+  email_from: "OpenStreetMap <openstreetmap@example.com>"
+  email_return_path: "openstreetmap@example.com"

   # API version
   api_version: "0.6"
   # Application status - possible values are:
   # API version
   api_version: "0.6"
   # Application status - possible values are:


@@ -47,9 +50,8 @@ defaults: &defaults
   #messages_domain: "messages.openstreetmap.org"
   # Geonames authentication details
   #geonames_username: ""
   #messages_domain: "messages.openstreetmap.org"
   # Geonames authentication details
   #geonames_username: ""

-  # Quova authentication details
-  #quova_username: ""
-  #quova_password: ""
+  # GeoIP database
+  #geoip_database: ""

   # Users to show as being nearby
   nearby_users: 30
   # Max radius, in km, for nearby users
   # Users to show as being nearby
   nearby_users: 30
   # Max radius, in km, for nearby users


@@ -58,6 +60,10 @@ defaults: &defaults
   spam_threshold: 50
   # Default legale (jurisdiction location) for contributor terms
   default_legale: GB
   spam_threshold: 50
   # Default legale (jurisdiction location) for contributor terms
   default_legale: GB

+  # Use the built-in jobs queue for importing traces
+  # Leave as false if you are using the external high-speed gpx importer
+  # https://github.com/openstreetmap/gpx-import
+  trace_use_job_queue: false

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


@@ -72,7 +78,7 @@ defaults: &defaults
   # Enable legacy OAuth 1.0 support
   oauth_10_support: true
   # URL of Nominatim instance to use for geocoding
   # Enable legacy OAuth 1.0 support
   oauth_10_support: true
   # URL of Nominatim instance to use for geocoding

-  nominatim_url: "//nominatim.openstreetmap.org/"
+  nominatim_url: "https://nominatim.openstreetmap.org/"

   # Default editor
   default_editor: "id"
   # OAuth consumer key for Potlatch 2
   # Default editor
   default_editor: "id"
   # OAuth consumer key for Potlatch 2


@@ -81,22 +87,20 @@ defaults: &defaults
   #oauth_key: ""
   # OAuth consumer key for iD
   #id_key: ""
   #oauth_key: ""
   # OAuth consumer key for iD
   #id_key: ""

-  # Whether to require users to view the CTs before continuing to edit...
-  require_terms_seen: false
-  # Whether to require users to agree to the CTs before editing
-  require_terms_agreed: false

   # 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}.*"
   # 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}.*"

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

   # URL of Overpass instance to use for feature queries
   # URL of Overpass instance to use for feature queries

-  overpass_url: "//overpass-api.de/api/interpreter"
+  overpass_url: "https://overpass-api.de/api/interpreter"

   # Routing endpoints
   # Routing endpoints

-  graphhopper_url: "//graphhopper.com/api/1/route"
-  mapquest_directions_url: "//open.mapquestapi.com/directions/v2/route"
-  mapzen_valhalla_url: "//valhalla.mapzen.com/route"
-  osrm_url: "//router.project-osrm.org/route/v1/driving/"
+  graphhopper_url: "https://graphhopper.com/api/1/route"
+  fossgis_osrm_url: "https://routing.openstreetmap.de/"

   # External authentication credentials
   #google_auth_id: ""
   #google_auth_secret: ""
   # External authentication credentials
   #google_auth_id: ""
   #google_auth_secret: ""


@@ -107,10 +111,16 @@ defaults: &defaults
   #windowslive_auth_secret: ""
   #github_auth_id: ""
   #github_auth_secret: ""
   #windowslive_auth_secret: ""
   #github_auth_id: ""
   #github_auth_secret: ""

-  # MapQuest authentication details
-  #mapquest_key: ""
-  # Mapzen authentication details
-  #mapzen_valhalla_key: ""
+  #wikipedia_auth_id: ""
+  #wikipedia_auth_secret: ""
+  # Thunderforest authentication details
+  #thunderforest_key: ""
+  # Key for generating TOTP tokens
+  #totp_key: ""
+  # Enforce Content-Security-Policy
+  csp_enforce: false
+  # URL for reporting Content-Security-Policy violations
+  #csp_report_url: ""

 
 development:
   <<: *defaults
 
 development:
   <<: *defaults


@@ -132,3 +142,5 @@ test:
   windowslive_auth_secret: "dummy"
   github_auth_id: "dummy"
   github_auth_secret: "dummy"
   windowslive_auth_secret: "dummy"
   github_auth_id: "dummy"
   github_auth_secret: "dummy"

+  wikipedia_auth_id: "dummy"
+  wikipedia_auth_secret: "dummy"