diff --git a/apps/feed_import/views.py b/apps/feed_import/views.py index 56bcff29f..fb6873884 100644 --- a/apps/feed_import/views.py +++ b/apps/feed_import/views.py @@ -221,10 +221,11 @@ def import_signup(request): user_token.user = new_user user_token.save() login_user(request, new_user) + if request.user.profile.is_premium: + return HttpResponseRedirect(reverse('index')) url = "https://%s%s" % (Site.objects.get_current().domain, reverse('stripe-form')) return HttpResponseRedirect(url) - # return HttpResponseRedirect(reverse('index')) else: logging.user(request, "~BR~FW ***> Can't find user token during import/signup. Re-authenticating...") return HttpResponseRedirect(reverse('google-reader-authorize')) diff --git a/config/hosts b/config/hosts index d3ecbb48f..8b7116328 100644 --- a/config/hosts +++ b/config/hosts @@ -12,6 +12,9 @@ 199.15.249.99 db05 db05.newsblur.com 199.15.249.101 db07 db07.newsblur.com +198.211.109.225 db10 db10.newsblur.com +198.211.109.224 db11 db11.newsblur.com + 199.15.250.231 task01 task01.newsblur.com 199.15.252.156 task02 task02.newsblur.com 199.15.250.233 task03 task03.newsblur.com diff --git a/fabfile.py b/fabfile.py index abb4437bc..44fb6c5e7 100644 --- a/fabfile.py +++ b/fabfile.py @@ -68,11 +68,11 @@ env.roledefs ={ 'ec2-54-234-182-177.compute-1.amazonaws.com', 'ec2-23-22-123-187.compute-1.amazonaws.com', ], - 'ec2task': ['ec2-54-242-38-48.compute-1.amazonaws.com', + 'ec2task': [#'ec2-54-242-38-48.compute-1.amazonaws.com', 'ec2-184-72-214-147.compute-1.amazonaws.com', 'ec2-107-20-103-16.compute-1.amazonaws.com', 'ec2-50-17-12-16.compute-1.amazonaws.com', - 'ec2-54-242-34-138.compute-1.amazonaws.com', + #'ec2-54-242-34-138.compute-1.amazonaws.com', 'ec2-184-73-2-61.compute-1.amazonaws.com', ], 'vps': ['task01.newsblur.com', @@ -356,8 +356,8 @@ def setup_db(skip_common=False): setup_db_motd() copy_task_settings() setup_memcached() - setup_postgres(standby=False) - setup_mongo() + # setup_postgres(standby=False) + # setup_mongo() setup_gunicorn(supervisor=False) setup_redis() setup_db_munin() diff --git a/settings.py b/settings.py index 9d443a642..7182c2600 100644 --- a/settings.py +++ b/settings.py @@ -314,9 +314,6 @@ CELERY_QUEUES = { }, } CELERY_DEFAULT_QUEUE = "work_queue" -BROKER_BACKEND = "redis" -BROKER_URL = "redis://db02:6379/0" -CELERY_RESULT_BACKEND = BROKER_URL CELERYD_PREFETCH_MULTIPLIER = 1 CELERY_IMPORTS = ("apps.rss_feeds.tasks", @@ -419,7 +416,7 @@ class MasterSlaveRouter(object): # ========= REDIS = { - 'host': 'db02', + 'host': 'db01', } # ================= @@ -484,6 +481,14 @@ DEBUG_TOOLBAR_CONFIG = { } RAVEN_CLIENT = raven.Client(SENTRY_DSN) +# ========= +# = Redis = +# ========= + +BROKER_BACKEND = "redis" +BROKER_URL = "redis://%s:6379/0" % REDIS['host'] +CELERY_RESULT_BACKEND = BROKER_URL + # ========= # = Mongo = # =========