Update html5shiv to 3.7.3

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

diff --git a/config/example.application.yml b/config/example.application.yml
index 30f367f1cc0562a3391beabd0e7cd2a00381e93f..7435fea89a052d39be95d26c32a992f94cba3454 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
-  # 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"
@@ -66,26 +63,41 @@ defaults: &defaults
   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
-  nominatim_url: "http://nominatim.openstreetmap.org/"
+  nominatim_url: "//nominatim.openstreetmap.org/"
   # Default editor
-  default_editor: "potlatch2"
+  default_editor: "id"
   # OAuth consumer key for Potlatch 2
   #potlatch2_key: ""
   # OAuth consumer key for the web site
   #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
-  # Piwik details
-  #piwik_location: "piwik.openstreetmap.org"
-  #piwik_site: 1
-  #piwik_signup_goal: 1
+  # Imagery to return in capabilities as blacklisted
+  imagery_blacklist:
+    - ".*\\.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: ""
 
 development:
   <<: *defaults
@@ -95,3 +107,13 @@ production:
 
 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"