11652: Merge branch 'master' into 11652-recursive-contents

[arvados.git] / services / api / config / application.yml.example

diff --git a/services/api/config/application.yml.example b/services/api/config/application.yml.example
index 305ea88d5a019ea0495d2470127f178c37708642..3681952508509b07ea13168a712ecfa685165857 100644 (file)
--- a/services/api/config/application.yml.example
+++ b/services/api/config/application.yml.example
@@ -10,19 +10,33 @@
 # 4. Section in application.default.yml corresponding to RAILS_ENV
 # 5. Section in application.default.yml called "common"
 
-development:
-  # Mandatory site secrets. See application.default.yml for more info.
+production:
+  # Mandatory site configuration.  See application.default.yml and
+  # http://http://doc.arvados.org/install/install-api-server.html#configure_application
+  # for more information.
+  uuid_prefix: ~
   secret_token: ~
   blob_signing_key: ~
-  uuid_prefix: bogus
-  workbench_address: https://localhost:3031
+  sso_app_secret: ~
+  sso_app_id: ~
+  sso_provider_url: ~
+  workbench_address: ~
+  websocket_address: ~
+  #git_repositories_dir: ~
+  #git_internal_dir: ~
 
-production:
-  # Mandatory site secrets. See application.default.yml for more info.
+development:
+  # Separate settings for development configuration.
+  uuid_prefix: ~
   secret_token: ~
   blob_signing_key: ~
-  uuid_prefix: bogus
-  workbench_address: https://workbench.bogus.arvadosapi.com
+  sso_app_id: ~
+  sso_app_secret: ~
+  sso_provider_url: ~
+  workbench_address: ~
+  websocket_address: ~
+  #git_repositories_dir: ~
+  #git_internal_dir: ~
 
 test:
   # Tests should be able to run without further configuration, but if you do
@@ -32,8 +46,3 @@ common:
   # Settings in this section will be used in all environments
   # (development, production, test) except when overridden in the
   # environment-specific sections above.
-  auto_admin_user: peter.amstutz@curoverse.com
-  git_repositories_dir: /home/tetron/work/git
-  git_internal_dir: /home/tetron/work/internal.git
-  secret_token: 5520a2018819190aa4abe42c0807049cf85504a162570592acc9214f4b14914f2e610a40b58e97c57fb5a8e96ec3a00bcef56c1f747766537e6e5022bb3f3764
-  blob_signing_key: 5eef1e322b2bfa28f8adb748c6244a66d4eef0cbb5bb45108d7b364e91faf28a73eede086fb0d3670ce2e7822a8d8149af129ab57f9be4fec98bb0be482ee69a