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 bef0f2845b5cca3395ff3fb1893a9b525c121b90..7435fea89a052d39be95d26c32a992f94cba3454 100644 (file)
--- a/config/example.application.yml
+++ b/config/example.application.yml
@@ -63,6 +63,8 @@ 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
@@ -88,6 +90,14 @@ defaults: &defaults
     - ".*\\.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
@@ -99,3 +109,11 @@ 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"