Merge branch 'master' of github.com:TechEmpower/FrameworkBenchmarks

Dith3r · Feb 26, 2014 · 7153209 · 7153209
2 parents 371e7a2 + d0c8979
commit 7153209
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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;

diff --git a/toolset/setup/linux/installer.py b/toolset/setup/linux/installer.py
@@ -265,8 +265,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")