瀏覽代碼

Lua/octopus fix (#2559)

* Lua/octopus fix

* fix sed statement

* more fixes

* Update setup.sh

* Update setup.sh
Nate 8 年之前
父節點
當前提交
c04137a7f8
共有 2 個文件被更改,包括 8 次插入2 次删除
  1. 2 2
      frameworks/Lua/octopus/config.lua
  2. 6 0
      frameworks/Lua/octopus/setup.sh

+ 2 - 2
frameworks/Lua/octopus/config.lua

@@ -21,7 +21,7 @@ return {
 	
 	databaseConnection = {
 		rdbms       =   "mysql",
-		host        =   os.getenv("DBHOST"),
+		host        =   "DBHOSTNAME",
 		port        =   3306, 
 		database    =   "hello_world",
 		user        =   "benchmarkdbuser",
@@ -36,4 +36,4 @@ return {
 		sessionTimeout = 3600,
 		usePreparedStatement = false,
 	},
-}
+}

+ 6 - 0
frameworks/Lua/octopus/setup.sh

@@ -9,9 +9,15 @@ cd octopus
 git checkout 0c4fc42198fed3a299c78d4b910188113d478bc5
 cd ..
 
+# The following line is a hacky way to get this framework working.
+# zlib fix needs to happen within the framework owner's repo
+sed -i 's|zlib_url=http://zlib.net/zlib-$zlib_version.tar.gz|zlib_url=https://github.com/madler/zlib/archive/v$zlib_version.tar.gz|g' octopus/bin/unix/server.sh
+
 cp -avr app octopus/extensions
 cp -vf config.lua octopus/extensions
 
+sed -i 's|DBHOSTNAME|'"${DBHOST}"'|g' octopus/extensions/config.lua
+
 cd octopus/bin/unix
 . ./server.sh install
 . ./server.sh build