From 4a0edf6278c88f90f3b10ee4aebfd4d6e3b18fa8 Mon Sep 17 00:00:00 2001 From: Erwan Ameil Date: Wed, 29 Jan 2014 18:14:17 +0100 Subject: [PATCH 1/2] Nail Mongrel2 version to v1.8.1 --- toolset/setup/linux/installer.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/toolset/setup/linux/installer.py b/toolset/setup/linux/installer.py index f062955f124..15e8989fdd9 100644 --- a/toolset/setup/linux/installer.py +++ b/toolset/setup/linux/installer.py @@ -269,8 +269,10 @@ def __install_server_software(self): self.__run_command("sudo make install", cwd="zeromq-4.0.3") self.__run_command("sudo apt-get install sqlite3 libsqlite3-dev uuid uuid-runtime uuid-dev") self.__run_command("sudo ldconfig -v") - self.__run_command("git clone git://github.com/zedshaw/mongrel2.git mongrel2", retry=True) - # for zmq4, we update the following file manually (not in the stable master branch yet) + self.__download("https://github.com/zedshaw/mongrel2/tarball/v1.8.1", "mongrel2.tar.gz") + self.__run_command("tar xvf mongrel2.tar.gz") + self.__run_command("mv zedshaw-mongrel2-aa2ecf8 mongrel2") + # for zmq4, we update the following file manually (not in v1.8.1) self.__download("https://raw.github.com/zedshaw/mongrel2/9b565eeea003783c47502c2d350b99c9684ce97c/src/zmq_compat.h") self.__run_command("mv -f zmq_compat.h mongrel2/src/") self.__run_command("make clean all && sudo make install", cwd="mongrel2") From 00b7b9559799c5516781ddf7eaa53ce979a9f317 Mon Sep 17 00:00:00 2001 From: Tor Hveem Date: Tue, 25 Feb 2014 17:50:34 +0100 Subject: [PATCH 2/2] auto worker procs for lapis to allow scaling --- lapis/nginx.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/lapis/nginx.conf b/lapis/nginx.conf index 03869e4e68f..82e2761d204 100644 --- a/lapis/nginx.conf +++ b/lapis/nginx.conf @@ -1,3 +1,4 @@ + worker_processes auto; # pid /tmp/nginx.pid; error_log stderr crit; #error_log /tmp/test.log error;