From efc793b1add727555939f6150ea12b7211e430ee Mon Sep 17 00:00:00 2001 From: Samuel Clay Date: Fri, 22 Aug 2014 08:17:53 -0700 Subject: [PATCH] Fixing pip requirements conflicts. --- config/requirements.txt | 2 +- fabfile.py | 2 ++ templates/maintenance_off.html | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/config/requirements.txt b/config/requirements.txt index 6c7c95abf..b02e7d579 100755 --- a/config/requirements.txt +++ b/config/requirements.txt @@ -1,4 +1,5 @@ BeautifulSoup==3.2.1 +six==1.6.1 boto==2.8.0 celery==3.0.17 chardet==2.1.1 @@ -26,7 +27,6 @@ nltk==2.0.4 oauth2==1.5.211 psutil==2.1.0 pyes==0.90.1 -six==1.6.1 simplejson==3.4.0 pyflakes==0.6.1 pymongo==2.5.2 diff --git a/fabfile.py b/fabfile.py index 57d9641dc..33febd6cb 100644 --- a/fabfile.py +++ b/fabfile.py @@ -280,6 +280,7 @@ def setup_task(queue=None, skip_common=False): done() def setup_task_image(): + setup_installs() copy_task_settings() setup_hosts() config_pgbouncer() @@ -332,6 +333,7 @@ def setup_installs(): 'libfreetype6-dev', 'python-imaging', ] + sudo("sed -i -e 's/archive.ubuntu.com\|security.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list") sudo('apt-get -y update') sudo('DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes upgrade') sudo('DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes install %s' % ' '.join(packages)) diff --git a/templates/maintenance_off.html b/templates/maintenance_off.html index d419db979..6c9699c0d 100644 --- a/templates/maintenance_off.html +++ b/templates/maintenance_off.html @@ -75,7 +75,7 @@ margin: 0 0 48px; } - NewsBlur is upgrading... + NewsBlur is coming back... @@ -85,7 +85,7 @@

NewsBlur is in maintenance mode

-

This will take about 20 seconds. I'm deprecating an old primary mongodb server, which can take a few seconds to propagate.

+

NewsBlur's Mongo database ran into disk space issues because Mongo grows unbounded without running a vacuum/compact process (unlike all of the other databases: postgres, mysql, redis, and elasticsearch). Fixing the Mongo Analytics db. This should only take a minute.

To pass the time, check out what's popular on MLKSHK.