Merge pull request #1887 from nbrady-techempower/postgres-vagrant-fix

Lua language fixes

config/postgresql.conf

@@ -109,7 +109,7 @@ ssl = false                             # (change requires restart)
 # details: http://www.postgresql.org/docs/9.4/static/runtime-config-resource.html
 # http://www.postgresql.org/docs/9.4/static/runtime-config-wal.html
 # http://www.postgresql.org/docs/9.4/static/runtime-config-query.html
-shared_buffers = 2GB                    # min 128kB
+shared_buffers = 256MB                    # min 128kB
 work_mem = 64MB                                # min 64kB
 maintenance_work_mem = 512MB            # min 1MB
 checkpoint_segments = 64

toolset/setup/linux/languages/lua.sh

@@ -8,10 +8,20 @@ RETCODE=$(fw_exists ${IROOT}/lua.installed)
 LUA_VERSION="5.1"
 LUA_MICRO="5"
 
-fw_get -O https://github.com/LuaDist/lua/archive/$LUA_VERSION.$LUA_MICRO-Ubuntu-x86_64.tar.gz
-fw_untar $LUA_VERSION.$LUA_MICRO-Ubuntu-x86_64.tar.gz
+fw_get -O https://github.com/LuaDist/lua/archive/$LUA_VERSION.$LUA_MICRO.tar.gz
+fw_untar $LUA_VERSION.$LUA_MICRO.tar.gz
+
+LUA_HOME=$IROOT/lua-$LUA_VERSION.$LUA_MICRO
+
+cd $LUA_HOME
+cp src/luaconf.h.orig src/luaconf.h
+make linux
+cd src
+mkdir ../bin ../include ../lib
+install -p -m 0755 lua luac ../bin
+install -p -m 0644 lua.h luaconf.h lualib.h lauxlib.h ../include
+install -p -m 0644 liblua.a ../lib
 
-LUA_HOME=$IROOT/lua-$LUA_VERSION.$LUA_MICRO-Ubuntu-x86_64
 echo "export LUA_HOME=${LUA_HOME}" > $IROOT/lua.installed
 echo "export LUA_VERSION=${LUA_VERSION}" >> $IROOT/lua.installed
 echo "export LUA_MICRO=${LUA_MICRO}" >> $IROOT/lua.installed

toolset/setup/linux/systools/luarocks.sh

@@ -15,7 +15,7 @@ fw_untar luarocks-$LUAROCKS_VERSION.tar.gz
 
 cd $LUAROCKS
 ./configure --prefix=$LUA_HOME --with-lua=$LUA_HOME
-make bootstrap
+make --quiet bootstrap
 
 echo "" > $IROOT/luarocks.installed
 

toolset/setup/linux/webservers/openresty.sh

@@ -16,8 +16,8 @@ fw_untar ngx_openresty-$OPENRESTY_VERSION.tar.gz
 
 cd ngx_openresty-$OPENRESTY_VERSION
 ./configure --with-luajit-xcflags=-DLUAJIT_NUMMODE=2 --with-http_postgres_module --prefix=$OPENRESTY_HOME -j4
-make -j4
-make install
+make -j4 --quiet
+make --quiet install
 
 echo "export OPENRESTY_HOME=${OPENRESTY_HOME}" > $IROOT/openresty.installed
 echo -e "export PATH=\$OPENRESTY_HOME/nginx/sbin:\$PATH" >> $IROOT/openresty.installed