public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-09-18 21:50:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing auto bootstraps. Also splitting favicons onto its own server.

Browse source
This commit is contained in:
Samuel Clay 2013-06-23 12:51:50 -07:00
parent 38082c73dc
commit a83daad8c6
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
config/debug_haproxy.conf
View file

@ -41,24 +41,27 @@ frontend public
monitor fail if gunicorn_dead monitor fail if gunicorn_dead
monitor fail if nginx_dead monitor fail if nginx_dead
monitor fail if mx_mode 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 /media/ }
use_backend nginx if { path_beg /static/ } use_backend nginx if { path_beg /static/ }
use_backend nginx if { path_beg /favicon } use_backend nginx if { path_beg /favicon }
use_backend nginx if { path_beg /crossdomain/ } use_backend nginx if { path_beg /crossdomain/ }
use_backend nginx if { path_beg /robots } use_backend nginx if { path_beg /robots }
use_backend nginx if { path_beg /munin/ } use_backend nginx if { path_beg /munin/ }
use_backend nginx if { path_beg /rss_feeds/icon }
use_backend nginx if mx_mode use_backend nginx if mx_mode
use_backend gunicorn unless gunicorn_dead || nginx_dead use_backend gunicorn unless gunicorn_dead || nginx_dead
backend node backend node_socket
balance roundrobin balance roundrobin
server nodedebug 127.0.0.1:8888 check inter 2000ms 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 backend nginx
balance roundrobin balance roundrobin

2
config/supervisord.conf
View file

@ -8,7 +8,7 @@ chmod=0700 ; sockef file mode (default 0700)
logfile=/var/log/supervisor/supervisord.log ; (main log file;default $CWD/supervisord.log) logfile=/var/log/supervisor/supervisord.log ; (main log file;default $CWD/supervisord.log)
pidfile=/var/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid) pidfile=/var/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
childlogdir=/var/log/supervisor ; ('AUTO' child log dir, default $TEMP) 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 ; the below section must remain in the config file for RPC
; (supervisorctl/web interface) to work, additional interfaces may be ; (supervisorctl/web interface) to work, additional interfaces may be

6
fabfile.py vendored
View file

@ -245,8 +245,8 @@ def setup_task(queue=None, skip_common=False):
def setup_installs(): def setup_installs():
sudo('apt-get -y update') sudo('apt-get -y update')
sudo('apt-get -y upgrade') sudo('DEBIAN_FRONTEND=noninteractive 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 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/libjpeg.so /usr/lib")
sudo("ln -s /usr/lib/x86_64-linux-gnu/libfreetype.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): def setup_do(name, size=2):
INSTANCE_SIZE = "%sGB" % size 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) 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()) sizes = dict((s.name, s.id) for s in doapi.sizes())
size_id = sizes[INSTANCE_SIZE] size_id = sizes[INSTANCE_SIZE]