Updating fabric and fixing a bug around Adding the NewsBlur feed from the tutorial and the address is blank.

This commit is contained in:
Samuel Clay 2011-05-20 17:34:39 -04:00
parent f26166622d
commit d47a994b2e
2 changed files with 5 additions and 3 deletions

5
fabfile.py vendored
View file

@ -154,6 +154,7 @@ def setup_task():
enable_celery_supervisor()
setup_gunicorn(supervisor=False)
update_gunicorn()
config_monit()
# ==================
# = Setup - Common =
@ -169,7 +170,7 @@ def setup_installs():
sudo('mkdir -p /var/run/postgresql')
sudo('chown postgres.postgres /var/run/postgresql')
put('config/munin.conf', '/etc/munin/munin.conf', use_sudo=True)
run('git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh')
run('git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh', warn_only=True)
run('curl -O http://peak.telecommunity.com/dist/ez_setup.py')
sudo('python ez_setup.py -U setuptools && rm ez_setup.py')
sudo('chsh sclay -s /bin/zsh')
@ -218,7 +219,7 @@ def setup_libxml_code():
def setup_python():
sudo('easy_install pip')
sudo('easy_install fabric django celery django-celery django-compress South django-devserver django-extensions guppy psycopg2 pymongo BeautifulSoup pyyaml nltk lxml oauth2 pytz boto')
sudo('easy_install fabric django celery django-celery django-compress South django-devserver django-extensions guppy psycopg2 pymongo BeautifulSoup pyyaml nltk==0.9.9 lxml oauth2 pytz boto')
sudo('su -c \'echo "import sys; sys.setdefaultencoding(\\\\"utf-8\\\\")" > /usr/lib/python2.6/sitecustomize.py\'')
put('config/pystartup.py', '.pystartup')

View file

@ -5084,7 +5084,8 @@
var feed = {
feed_id : feed_id,
feed_title : feed.feed_title || $('.NB-recommended-title', $recommended_feeds).text(),
favicon : feed.favicon ? $.favicon(feed.favicon) : $('.NB-recommended-favicon', $recommended_feeds).attr('src')
favicon : feed.favicon ? $.favicon(feed.favicon) : $('.NB-recommended-favicon', $recommended_feeds).attr('src'),
feed_address : feed.feed_address
};
this.reset_feed();