Merge branch 'schedule' into schedule_dev

* schedule:
  Fixing ulimit on new machines. Upgrading celery.
This commit is contained in:
Samuel Clay 2013-04-23 18:07:48 -07:00
commit 171dc0d996
2 changed files with 8 additions and 4 deletions

View file

@ -1,6 +1,6 @@
BeautifulSoup==3.2.1
boto==2.8.0
celery==3.0.16
celery==3.0.17
chardet==2.1.1
cssutils==0.9.10b1
django-celery-with-redis==3.0

10
fabfile.py vendored
View file

@ -566,7 +566,11 @@ def setup_ulimit():
run('echo "* soft nofile 10000" >> /etc/security/limits.conf', pty=False)
run('echo "* hard nofile 10000" >> /etc/security/limits.conf', pty=False)
sudo('chmod 644 /etc/security/limits.conf', pty=False)
sudo('chmod 666 /etc/sysctl.conf', pty=False)
run('echo "fs.file-max = 10000" >> /etc/sysctl.conf', pty=False)
sudo('chmod 644 /etc/sysctl.conf', pty=False)
sudo('sysctl -p')
# run('touch /home/ubuntu/.bash_profile')
# run('echo "ulimit -n $FILEMAX" >> /home/ubuntu/.bash_profile')
@ -749,7 +753,7 @@ def downgrade_pil():
# = Setup - DB =
# ==============
@parallel
# @parallel
def setup_db_firewall():
ports = [
5432, # PostgreSQL
@ -766,7 +770,7 @@ def setup_db_firewall():
# DigitalOcean
for ip in set(env.roledefs['app'] +
env.roledefs['dbdo'] +
env.roledefs['db'] +
env.roledefs['dev'] +
env.roledefs['debug'] +
env.roledefs['task'] +