Merge pull request #390 from Mashape/fix/distributions

Closing #357
Kong · Jul 9, 2015 · 8e65f44 · 8e65f44
2 parents 9823aac + 6445013
commit 8e65f44
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/distributions/.build-package-script.sh b/distributions/.build-package-script.sh
@@ -29,9 +29,9 @@ LUA_VERSION=5.1.4
 LUAJIT_VERSION=2.0.4
 PCRE_VERSION=8.36
 LUAROCKS_VERSION=2.2.2
-OPENRESTY_VERSION=1.7.10.2rc0
+OPENRESTY_VERSION=1.7.10.2
 DNSMASQ_VERSION=2.72
-OPENSSL_VERSION=1.0.2a
+OPENSSL_VERSION=1.0.2d
 
 # Variables to be used in the build process
 PACKAGE_TYPE=""
@@ -232,6 +232,11 @@ rockspec_version=${rockspec_basename#"kong-"}
 sed -i.bak s@${OUT}@@g $OUT/usr/local/bin/kong
 rm $OUT/usr/local/bin/kong.bak
 
+# Create Kong folder and default logging files
+mkdir -p $OUT/usr/local/kong/logs
+touch $OUT/usr/local/kong/logs/access.log
+touch $OUT/usr/local/kong/logs/error.log
+
 # Copy the conf to /etc/kong
 post_install_script=$(mktemp $MKTEMP_POSTSCRIPT_CONF)
 echo "#!/bin/sh

diff --git a/kong-0.4.0-1.rockspec b/kong-0.4.0-1.rockspec
@@ -82,6 +82,7 @@ build = {
     ["kong.dao.schemas.consumers"] = "kong/dao/schemas/consumers.lua",
     ["kong.dao.schemas.plugins_configurations"] = "kong/dao/schemas/plugins_configurations.lua",
     ["kong.dao.cassandra.factory"] = "kong/dao/cassandra/factory.lua",
+    ["kong.dao.cassandra.query_builder"] = "kong/dao/cassandra/query_builder.lua",
     ["kong.dao.cassandra.base_dao"] = "kong/dao/cassandra/base_dao.lua",
     ["kong.dao.cassandra.migrations"] = "kong/dao/cassandra/migrations.lua",
     ["kong.dao.cassandra.apis"] = "kong/dao/cassandra/apis.lua",
@@ -164,6 +165,7 @@ build = {
     ["kong.api.routes.kong"] = "kong/api/routes/kong.lua",
     ["kong.api.routes.apis"] = "kong/api/routes/apis.lua",
     ["kong.api.routes.consumers"] = "kong/api/routes/consumers.lua",
+    ["kong.api.routes.plugins"] = "kong/api/routes/plugins.lua",
     ["kong.api.routes.plugins_configurations"] = "kong/api/routes/plugins_configurations.lua",
   },
   install = {