ngx_mruby cleanup

- add ngx_mruby to travis
- merge nginx install into mruby install.sh
- add config options to nginx.conf
- remove comments

.travis.yml

@@ -124,6 +124,7 @@ env:
     - "TESTDIR=Python/wsgi"
     - "TESTDIR=Racket/racket-ws"
     - "TESTDIR=Ruby/grape"
+    - "TESTDIR=Ruby/ngx_mruby"
     - "TESTDIR=Ruby/padrino"
     - "TESTDIR=Ruby/rack"
     - "TESTDIR=Ruby/rails"

frameworks/Ruby/ngx_mruby/bash_profile.sh

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-export MRUBY_HOME=${IROOT}/nginx_mruby
-source $HOME/.rvm/scripts/rvm

frameworks/Ruby/ngx_mruby/install.sh

@@ -1,4 +1,20 @@
 #!/bin/bash
 
-#? m_ruby nginx
-fw_depends nginx_mruby
+PREFIX=${IROOT}/nginx_mruby
+
+RETCODE=$(fw_exists ${IROOT}/nginx_mruby.installed)
+[ ! "$RETCODE" == 0 ] || { return 0; }
+
+sudo apt-get install -y libhiredis-dev
+fw_depends rvm
+rvm install ruby-2.0.0-p0
+rvm use ruby-2.0.0-p0
+git clone git://github.com/matsumoto-r/ngx_mruby.git
+cd ngx_mruby
+git submodule init
+git submodule update
+
+NGINX_CONFIG_OPT_ENV="--prefix=${PREFIX} --with-http_stub_status_module" sh build.sh
+sudo make install
+
+touch ${IROOT}/nginx_mruby.installed

frameworks/Ruby/ngx_mruby/nginx.conf

@@ -3,6 +3,7 @@ error_log stderr error;
 
 events {
     worker_connections  16384;
+    multi_accept on;
 }
 
 http {

frameworks/Ruby/ngx_mruby/setup.sh

@@ -3,4 +3,4 @@
 sed -i 's|CWD|'"${TROOT}"'|g' nginx.conf
 sed -i 's|DBHOSTNAME|'"${DBHOST}"'|g' nginx.conf
 
-${MRUBY_HOME}/sbin/nginx -c $TROOT/nginx.conf -g "worker_processes '"${MAX_THREADS}"';" &
+${IROOT}/nginx_mruby/sbin/nginx -c $TROOT/nginx.conf -g "worker_processes '"${MAX_THREADS}"';" &

toolset/setup/linux/webservers/nginx_mruby.sh

@@ -1,32 +0,0 @@
-#!/bin/bash
-
-PREFIX=${IROOT}/nginx_mruby
-
-RETCODE=$(fw_exists ${IROOT}/nginx_mruby.installed)
-[ ! "$RETCODE" == 0 ] || { return 0; }
-
-sudo apt-get install -y libhiredis-dev
-fw_depends rvm
-rvm install ruby-2.0.0-p0
-rvm use ruby-2.0.0-p0
-#fw_depends nginx lua
-
-#fw_get http://openresty.org/download/ngx_openresty-1.7.4.1.tar.gz
-#fw_untar ngx_openresty-1.7.4.1.tar.gz
-git clone git://github.com/matsumoto-r/ngx_mruby.git
-cd ngx_mruby
-git submodule init
-git submodule update
-
-# RETCODE=$(fw_exists mruby/mrbgems/mruby-mysql)
-# if [ "$RETCODE" != 0 ] ; then
-#   git clone [email protected]:mattn/mruby-mysql.git mruby/mrbgems/mruby-mysql
-#   # cd mruby/mrbgems
-#   # git clone [email protected]:mattn/mruby-mysql.git mruby/mrbgems/m
-#   # cd ../..
-# fi
-
-NGINX_CONFIG_OPT_ENV="--prefix=${PREFIX} --with-http_stub_status_module" sh build.sh
-sudo make install
-
-touch ${IROOT}/nginx_mruby.installed