Add support for Google OAuth2 authentication

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

diff --git a/config/example.application.yml b/config/example.application.yml
index 5fd287f7fa6289b03ee0f909ff9311e371835f0d..bb556d2c99c2abaab4e6b5b864cec4a0aeb90bce 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"
@@ -91,6 +88,10 @@ 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: ""
 
 development:
   <<: *defaults
@@ -100,3 +101,5 @@ production:
 
 test:
   <<: *defaults
+  # Geonames credentials for testing
+  geonames_username: "dummy"