diff --git a/config/debug_haproxy.conf b/config/debug_haproxy.conf index e666cd567..11919ff5f 100644 --- a/config/debug_haproxy.conf +++ b/config/debug_haproxy.conf @@ -41,24 +41,27 @@ frontend public monitor fail if gunicorn_dead monitor fail if nginx_dead monitor fail if mx_mode - - use_backend node if { path_beg /socket.io/ } + + use_backend node_socket if { path_beg /socket.io/ } + use_backend node_favicon if { path_beg /rss_feeds/icon } use_backend nginx if { path_beg /media/ } use_backend nginx if { path_beg /static/ } use_backend nginx if { path_beg /favicon } use_backend nginx if { path_beg /crossdomain/ } use_backend nginx if { path_beg /robots } use_backend nginx if { path_beg /munin/ } - use_backend nginx if { path_beg /rss_feeds/icon } use_backend nginx if mx_mode use_backend gunicorn unless gunicorn_dead || nginx_dead -backend node +backend node_socket balance roundrobin server nodedebug 127.0.0.1:8888 check inter 2000ms +backend node_favicon + balance roundrobin + server nodedebug 127.0.0.1:81 check inter 2000ms backend nginx balance roundrobin diff --git a/config/supervisord.conf b/config/supervisord.conf index d4f173a20..62e7e91df 100644 --- a/config/supervisord.conf +++ b/config/supervisord.conf @@ -8,7 +8,7 @@ chmod=0700 ; sockef file mode (default 0700) logfile=/var/log/supervisor/supervisord.log ; (main log file;default $CWD/supervisord.log) pidfile=/var/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid) childlogdir=/var/log/supervisor ; ('AUTO' child log dir, default $TEMP) -minfds = 10000 +# minfds = 10000 ; the below section must remain in the config file for RPC ; (supervisorctl/web interface) to work, additional interfaces may be diff --git a/fabfile.py b/fabfile.py index 0851ff0cb..bb24abc75 100644 --- a/fabfile.py +++ b/fabfile.py @@ -245,8 +245,8 @@ def setup_task(queue=None, skip_common=False): def setup_installs(): sudo('apt-get -y update') - sudo('apt-get -y upgrade') - sudo('apt-get -y install build-essential gcc scons libreadline-dev sysstat iotop git python-dev locate python-software-properties software-properties-common libpcre3-dev libncurses5-dev libdbd-pg-perl libssl-dev make pgbouncer python-setuptools python-psycopg2 libyaml-0-2 python-yaml python-numpy python-scipy curl monit ufw libjpeg8 libjpeg62-dev libfreetype6 libfreetype6-dev python-imaging') + sudo('DEBIAN_FRONTEND=noninteractive apt-get -y upgrade') + sudo('DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential gcc scons libreadline-dev sysstat iotop git python-dev locate python-software-properties software-properties-common libpcre3-dev libncurses5-dev libdbd-pg-perl libssl-dev make pgbouncer python-setuptools python-psycopg2 libyaml-0-2 python-yaml python-numpy python-scipy curl monit ufw libjpeg8 libjpeg62-dev libfreetype6 libfreetype6-dev python-imaging') sudo("ln -s /usr/lib/x86_64-linux-gnu/libjpeg.so /usr/lib") sudo("ln -s /usr/lib/x86_64-linux-gnu/libfreetype.so /usr/lib") @@ -921,7 +921,7 @@ def copy_task_settings(): def setup_do(name, size=2): INSTANCE_SIZE = "%sGB" % size - IMAGE_NAME = "Ubuntu 13.04 x64 Server" + IMAGE_NAME = "Ubuntu 13.04 x64" doapi = dop.client.Client(django_settings.DO_CLIENT_KEY, django_settings.DO_API_KEY) sizes = dict((s.name, s.id) for s in doapi.sizes()) size_id = sizes[INSTANCE_SIZE]