public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-08-05 16:58:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing limits.conf to just use integers.

Browse source
This commit is contained in:
Samuel Clay 2013-03-26 16:55:29 -07:00
parent bb803c50b4
commit 3bb1c95f91
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
fabfile.py vendored
View file

@ -325,7 +325,8 @@ def setup_db(engine=None, skip_common=False):
setup_db_firewall() setup_db_firewall()
setup_db_motd() setup_db_motd()
copy_task_settings() copy_task_settings()
setup_memcached() if engine == "memcached":
setup_memcached()
if engine == "postgres": if engine == "postgres":
setup_postgres(standby=False) setup_postgres(standby=False)
elif engine == "postgres_slave": elif engine == "postgres_slave":
@ -529,15 +530,15 @@ def setup_logrotate():
put('config/logrotate.conf', '/etc/logrotate.d/newsblur', use_sudo=True) put('config/logrotate.conf', '/etc/logrotate.d/newsblur', use_sudo=True)
def setup_ulimit(): def setup_ulimit():
# Increase File Descriptor limits. # Increase File Descriptor limits.
run('export FILEMAX=`sysctl -n fs.file-max`', pty=False) run('export FILEMAX=`sysctl -n fs.file-max`', pty=False)
sudo('mv /etc/security/limits.conf /etc/security/limits.conf.bak', pty=False) sudo('mv /etc/security/limits.conf /etc/security/limits.conf.bak', pty=False)
sudo('touch /etc/security/limits.conf', pty=False) sudo('touch /etc/security/limits.conf', pty=False)
sudo('chmod 666 /etc/security/limits.conf', pty=False) sudo('chmod 666 /etc/security/limits.conf', pty=False)
run('echo "root soft nofile $FILEMAX" >> /etc/security/limits.conf', pty=False) run('echo "root soft nofile 10000" >> /etc/security/limits.conf', pty=False)
run('echo "root hard nofile $FILEMAX" >> /etc/security/limits.conf', pty=False) run('echo "root hard nofile 10000" >> /etc/security/limits.conf', pty=False)
run('echo "* soft nofile $FILEMAX" >> /etc/security/limits.conf', pty=False) run('echo "* soft nofile 10000" >> /etc/security/limits.conf', pty=False)
run('echo "* hard nofile $FILEMAX" >> /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 644 /etc/security/limits.conf', pty=False)
# run('touch /home/ubuntu/.bash_profile') # run('touch /home/ubuntu/.bash_profile')
@ -926,7 +927,8 @@ def setup_do(name, size=2):
size_id=size_id, size_id=size_id,
image_id=image_id, image_id=image_id,
region_id=region_id, region_id=region_id,
ssh_key_ids=[str(ssh_key_id)]) ssh_key_ids=[str(ssh_key_id)],
virtio=True)
print "Booting droplet: %s/%s (size: %s)" % (instance.id, IMAGE_NAME, INSTANCE_SIZE) print "Booting droplet: %s/%s (size: %s)" % (instance.id, IMAGE_NAME, INSTANCE_SIZE)
instance = doapi.show_droplet(instance.id) instance = doapi.show_droplet(instance.id)