public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-09-18 21:50:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing pip requirements conflicts.

Browse source
This commit is contained in:
Samuel Clay 2014-08-22 08:17:53 -07:00
parent a512d0a82c
commit efc793b1ad
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/requirements.txt
View file

@ -1,4 +1,5 @@
BeautifulSoup==3.2.1 BeautifulSoup==3.2.1
six==1.6.1
boto==2.8.0 boto==2.8.0
celery==3.0.17 celery==3.0.17
chardet==2.1.1 chardet==2.1.1
@ -26,7 +27,6 @@ nltk==2.0.4
oauth2==1.5.211 oauth2==1.5.211
psutil==2.1.0 psutil==2.1.0
pyes==0.90.1 pyes==0.90.1
six==1.6.1
simplejson==3.4.0 simplejson==3.4.0
pyflakes==0.6.1 pyflakes==0.6.1
pymongo==2.5.2 pymongo==2.5.2

2
fabfile.py vendored
View file

@ -280,6 +280,7 @@ def setup_task(queue=None, skip_common=False):
done() done()
def setup_task_image(): def setup_task_image():
setup_installs()
copy_task_settings() copy_task_settings()
setup_hosts() setup_hosts()
config_pgbouncer() config_pgbouncer()
@ -332,6 +333,7 @@ def setup_installs():
'libfreetype6-dev', 'libfreetype6-dev',
'python-imaging', '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('apt-get -y update')
sudo('DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes upgrade') sudo('DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes upgrade')
sudo('DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes install %s' % ' '.join(packages)) sudo('DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes install %s' % ' '.join(packages))

4
templates/maintenance_off.html
View file

@ -75,7 +75,7 @@
margin: 0 0 48px; margin: 0 0 48px;
} }
</style> </style>
<title>NewsBlur is upgrading...</title> <title>NewsBlur is coming back...</title>
</head> </head>
<body> <body>
<table height="100%" width="100%"> <table height="100%" width="100%">
@ -85,7 +85,7 @@
<img src="/media/img/logo_512.png" class="logo"> <img src="/media/img/logo_512.png" class="logo">
<h1>NewsBlur is in <span class="error404">maintenance mode</span></h1> <h1>NewsBlur is in <span class="error404">maintenance mode</span></h1>
<div class="description"> <div class="description">
<p>This will take about 20 seconds. I'm deprecating an old primary mongodb server, which can take a few seconds to propagate.</p> <p>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.</p>
<p>To pass the time, <a href="http://mlkshk.com/popular">check out what's popular on MLKSHK</a>.</p> <p>To pass the time, <a href="http://mlkshk.com/popular">check out what's popular on MLKSHK</a>.</p>
</div> </div>
</div> </div>