Merge pull request #1238 from torhve/lua

Pulled, tested, verified locally; LGTM!

frameworks/Lua/lapis/install.sh

@@ -2,4 +2,4 @@
 
 fw_depends lua nginx openresty
 
-sudo luarocks install https://raw.githubusercontent.com/leafo/lapis/master/lapis-dev-1.rockspec
+sudo luarocks install --server=http://rocks.moonscript.org lapis

frameworks/Lua/lapis/source_code

@@ -1,3 +1,3 @@
-./lapis/web.lua
 ./lapis/web.moon
-./lapis/mime.types
+./lapis/config.moon
+./lapis/loader.moon

frameworks/Lua/openresty/nginx.conf

@@ -9,7 +9,7 @@ http {
     resolver 127.0.0.1;
     access_log off;
     lua_package_path 'CWD/?.lua;;';
-    init_by_lua 'require "resty.core" encode = require("cjson").encode mysql = require("resty.mysql")';
+    init_by_lua 'jit.opt.start("minstitch=10"); require "resty.core" encode = require("cjson").encode mysql = require("resty.mysql")';
     server {
         listen       8080;
         location /plaintext {

toolset/setup/linux/webservers/openresty.sh

@@ -1,16 +1,16 @@
 #!/bin/bash
 
-RETCODE=$(fw_exists ${IROOT}/openresty-1.7.4.1.installed)
+RETCODE=$(fw_exists ${IROOT}/openresty-1.7.7.1.installed)
 [ ! "$RETCODE" == 0 ] || { return 0; }
 
 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
+fw_get http://openresty.org/download/ngx_openresty-1.7.7.1.tar.gz
+fw_untar ngx_openresty-1.7.7.1.tar.gz
 
-cd ngx_openresty-1.7.4.1
-./configure --with-luajit-xcflags=-DLUAJIT_NUMMODE=2 --with-http_postgres_module --prefix=${IROOT}/openresty-1.7.4.1 -j4
+cd ngx_openresty-1.7.7.1
+./configure --with-luajit-xcflags=-DLUAJIT_NUMMODE=2 --with-http_postgres_module --prefix=${IROOT}/openresty-1.7.7.1 -j4
 make -j4
 make install
 
-touch ${IROOT}/openresty-1.7.4.1.installed
+touch ${IROOT}/openresty-1.7.7.1.installed