Merge remote-tracking branch 'openstreetmap/pull/1445'

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

diff --git a/config/example.application.yml b/config/example.application.yml
index b5d4db363f054d8b14af4eab88777850b2bf99d2..6319be709e5e72a7723273f2b77d005857ae6129 100644 (file)
--- a/config/example.application.yml
+++ b/config/example.application.yml
@@ -107,12 +107,16 @@ defaults: &defaults
   #windowslive_auth_secret: ""
   #github_auth_id: ""
   #github_auth_secret: ""
+  #wikipedia_auth_id: ""
+  #wikipedia_auth_secret: ""
   # MapQuest authentication details
   #mapquest_key: ""
   # Mapzen authentication details
   #mapzen_valhalla_key: ""
   # Thunderforest authentication details
   #thunderforest_key: ""
+  # Key for generating TOTP tokens
+  #totp_key: ""
 
 development:
   <<: *defaults
@@ -134,3 +138,5 @@ test:
   windowslive_auth_secret: "dummy"
   github_auth_id: "dummy"
   github_auth_secret: "dummy"
+  wikipedia_auth_id: "dummy"
+  wikipedia_auth_secret: "dummy"