diff --git a/config/requirements.txt b/config/requirements.txt index 3f6b23be9..049b67f46 100644 --- a/config/requirements.txt +++ b/config/requirements.txt @@ -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 diff --git a/fabfile.py b/fabfile.py index 770a56b17..7df2bad6f 100644 --- a/fabfile.py +++ b/fabfile.py @@ -561,7 +561,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') @@ -744,7 +748,7 @@ def downgrade_pil(): # = Setup - DB = # ============== -@parallel +# @parallel def setup_db_firewall(): ports = [ 5432, # PostgreSQL @@ -761,7 +765,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'] +