Merge branch 'master' into circular

* master:
  Moving redis servers.

fabfile.py

@@ -474,7 +474,7 @@ def setup_supervisor():
     sudo('sleep 2')
     sudo('/etc/init.d/supervisor start')
 
-# @parallel
+@parallel
 def setup_hosts():
     put('../secrets-newsblur/configs/hosts', '/etc/hosts', use_sudo=True)
 

node/unread_counts.coffee

@@ -1,7 +1,7 @@
 fs     = require 'fs'
 redis  = require 'redis'
 
-REDIS_SERVER = if process.env.NODE_ENV == 'development' then 'localhost' else 'db10'
+REDIS_SERVER = if process.env.NODE_ENV == 'development' then 'localhost' else 'db12'
 SECURE = !!process.env.NODE_SSL
 client = redis.createClient 6379, REDIS_SERVER
 

node/unread_counts.js

@@ -6,7 +6,7 @@
 
   redis = require('redis');
 
-  REDIS_SERVER = process.env.NODE_ENV === 'development' ? 'localhost' : 'db10';
+  REDIS_SERVER = process.env.NODE_ENV === 'development' ? 'localhost' : 'db12';
 
   SECURE = !!process.env.NODE_SSL;
 

settings.py

@@ -430,7 +430,7 @@ class MasterSlaveRouter(object):
 # =========
 
 REDIS = {
-    'host': 'db10',
+    'host': 'db12',
 }
 SESSION_REDIS_DB = 5
 

templates/maintenance_off.html

@@ -79,7 +79,7 @@
                         <img src="/media/img/logo_512.png" class="logo">
                         <h1>NewsBlur is in <span class="error404">maintenance mode</span></h1>
                         <div class="description">
-                            <p>This will take approximately 2-3 minutes. Redis is throwing errors left and right and needs to be switched out.</p>
+                            <p>This will take approximately 10 minutes. Moving the Redis DB to a beefier machine. This needs to happen, but it's why we had that spot of downtime a minute ago.</p>
                             <p>To pass the time, go surf <a href="http://mlkshk.com/popular" target="_blank">MLKSHK's popular page</a>.</p>
                             <p></p>
                         </div>