Merge pull request #316 from open-craft/jill/auth_mech

CRI-171 Makes the mongo authentication mechanism configurable from the environment
openedx · Apr 27, 2020 · a228f77 · a228f77
2 parents cd26759 + fafb9e8
commit a228f77
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/.travis/docker-compose-travis.yml b/.travis/docker-compose-travis.yml
@@ -13,6 +13,8 @@ services:
     container_name: forum_testing
     volumes:
       - ..:/edx/app/forum/cs_comments_service
+    environment:
+      MONGOID_AUTH_MECH: ""
   forum:
     extends: forum-base
     command: tail -f /dev/null

diff --git a/config/mongoid.yml b/config/mongoid.yml
@@ -9,6 +9,7 @@ common: &default_client
     timeout: <%= ENV['MONGOID_TIMEOUT'] || 0.5 %>
     ssl: <%= ENV['MONGOID_USE_SSL'] || false %>
     auth_source: <%= ENV['MONGOID_AUTH_SOURCE'] || '' %>
+    auth_mech: <%= ENV['MONGOID_AUTH_MECH'].nil? ? ':scram' : ENV['MONGOID_AUTH_MECH'] %>
 
 common_uri: &default_uri
   uri: <%= ENV['MONGOHQ_URL'] %>