Change Where am I to Where is this on left sidebar

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

diff --git a/config/example.application.yml b/config/example.application.yml
index 3fbebdc766c5d82424682433381aeeb5246463ca..8b61b50e6cd4ed6bf344197ec36ec896353eddbb 100644 (file)
--- a/config/example.application.yml
+++ b/config/example.application.yml
@@ -56,9 +56,6 @@ 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

-  # Memory limits (in Mb)
-  #soft_memory_limit: 512
-  #hard_memory_limit: 2048

   # 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"


@@ -66,12 +63,14 @@ defaults: &defaults
   attachments_dir: ":rails_root/public/attachments"
   # Log file to use
   #log_path: ""
   attachments_dir: ":rails_root/public/attachments"
   # Log file to use
   #log_path: ""

+  # Log file to use for logstash
+  #logstash_path: ""

   # List of memcache servers to use for caching
   #memcache_servers: []
   # Enable legacy OAuth 1.0 support
   oauth_10_support: true
   # URL of Nominatim instance to use for geocoding
   # List of memcache servers to use for caching
   #memcache_servers: []
   # Enable legacy OAuth 1.0 support
   oauth_10_support: true
   # URL of Nominatim instance to use for geocoding

-  nominatim_url: "http://nominatim.openstreetmap.org/"
+  nominatim_url: "//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


@@ -89,6 +88,20 @@ defaults: &defaults
     - ".*\\.googleapis\\.com/.*"
     - ".*\\.google\\.com/.*"
     - ".*\\.google\\.ru/.*"
     - ".*\\.googleapis\\.com/.*"
     - ".*\\.google\\.com/.*"
     - ".*\\.google\\.ru/.*"

+  # URL of Overpass instance to use for feature queries
+  overpass_url: "//overpass-api.de/api/interpreter"
+  # External authentication credentials
+  #google_auth_id: ""
+  #google_auth_secret: ""
+  #google_openid_realm: ""
+  #facebook_auth_id: ""
+  #facebook_auth_secret: ""
+  #windowslive_auth_id: ""
+  #windowslive_auth_secret: ""
+  # MapQuest authentication details
+  #mapquest_key: ""
+  # Mapzen authentication details
+  #mapzen_valhalla_key: ""

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


@@ -98,3 +111,13 @@ production:
 
 test:
   <<: *defaults
 
 test:
   <<: *defaults

+  # Geonames credentials for testing
+  geonames_username: "dummy"
+  # External authentication credentials for testing
+  google_auth_id: "dummy"
+  google_auth_secret: "dummy"
+  google_openid_realm: "https://www.openstreetmap.org"
+  facebook_auth_id: "dummy"
+  facebook_auth_secret: "dummy"
+  windowslive_auth_id: "dummy"
+  windowslive_auth_secret: "dummy"