diff --git a/fabfile.py b/fabfile.py index c9dbfeafc..080fa4daf 100644 --- a/fabfile.py +++ b/fabfile.py @@ -344,14 +344,17 @@ def setup_pymongo_repo(): def setup_forked_mongoengine(): with cd(os.path.join(env.VENDOR_PATH, 'mongoengine')): with settings(warn_only=True): - run('git remote add github http://github.com/samuelclay/mongoengine') - run('git checkout dev') - run('git pull github dev') + run('git checkout master') + run('git branch -D dev') + run('git remote add sclay git://github.com/samuelclay/mongoengine.git') + run('git fetch sclay') + run('git checkout -b dev sclay/dev') + run('git pull sclay dev') def switch_forked_mongoengine(): with cd(os.path.join(env.VENDOR_PATH, 'mongoengine')): run('git co dev') - run('git pull github dev --force') + run('git pull sclay dev --force') # run('git checkout .') # run('git checkout master') # run('get branch -D dev') diff --git a/settings.py b/settings.py index 2fdaff725..4aa8a162c 100644 --- a/settings.py +++ b/settings.py @@ -2,7 +2,6 @@ import sys import logging import os from mongoengine import connect -import pymongo import redis # =========================== @@ -462,9 +461,7 @@ DEBUG_TOOLBAR_CONFIG = { MONGO_DB_DEFAULTS = { 'name': 'newsblur', - 'host': 'mongodb://db01,db03/?slaveOk=true', - 'read_preference': pymongo.ReadPreference.PRIMARY, - 'replica_set': 'nbset', + 'host': 'db01,db03', } MONGO_DB = dict(MONGO_DB_DEFAULTS, **MONGO_DB) MONGODB = connect(MONGO_DB.pop('name'), **MONGO_DB)