зеркало из https://github.com/mozilla/labs-vcap.git
Merge changes I8068a506,I7ddc6b07
* changes: [dev_setup] Use github for lua-cjson source [dev_setup] set owner of mongo tarball
This commit is contained in:
Коммит
d51e0036e4
|
@ -6,9 +6,8 @@
|
|||
#
|
||||
|
||||
cf_remote_file File.join("", "tmp", "mongodb-linux-#{node[:kernel][:machine]}-#{node[:mongodb][:version]}.tgz") do
|
||||
# owner node[:deployment][:user]
|
||||
owner node[:deployment][:user]
|
||||
source node[:mongodb][:source]
|
||||
# not_if { ::File.exists?(File.join("", "tmp", "mongodb-linux-#{node[:kernel][:machine]}-#{node[:mongodb][:version]}.tgz")) }
|
||||
checksum '8f6a58293068e0fb28b463b955f3660f492094e53129fb88af4a7efcfc7995da'
|
||||
end
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ default[:lua][:version] = "5.1.4"
|
|||
default[:lua][:simple_version] = lua[:version].match(/\d+\.\d+/).to_s # something like 5.1
|
||||
default[:lua][:source] = "http://www.lua.org/ftp/lua-#{lua[:version]}.tar.gz"
|
||||
default[:lua][:path] = File.join(node[:deployment][:home], "deploy", "lua", "lua-#{lua[:version]}")
|
||||
default[:lua][:cjson_source] = "http://www.kyne.com.au/~mark/software/lua-cjson-1.0.3.tar.gz"
|
||||
default[:lua][:cjson_source] = "http://github.com/mpx/lua-cjson/tarball/ddbb686f535accac1e3cc375994191883fbe35d8"
|
||||
default[:lua][:module_path] = File.join(lua[:path], 'lib', 'lua', lua[:simple_version])
|
||||
default[:lua][:plugin_source_path] = File.join(node["cloudfoundry"]["path"], "router", "ext", "nginx")
|
||||
|
||||
|
|
|
@ -28,10 +28,11 @@ when "ubuntu"
|
|||
not_if { ::File.exists?(File.join("", "tmp", "lua-#{lua_version}.tar.gz")) }
|
||||
end
|
||||
|
||||
remote_file File.join("", "tmp", "lua-cjson-1.0.3.tar.gz") do
|
||||
lua_cjson_tarball = File.join(node[:deployment][:setup_cache], "lua-cjson-1.0.3.tar.gz")
|
||||
remote_file lua_cjson_tarball do
|
||||
owner node[:deployment][:user]
|
||||
source node[:lua][:cjson_source]
|
||||
not_if { ::File.exists?(File.join("", "tmp", "lua-cjson-1.0.3.tar.gz")) }
|
||||
checksum 'b4e3495dde10d087a9550d3a6f364e8998a5dda4f5f4722c69ff89420c9a8c09'
|
||||
end
|
||||
|
||||
# Nginx related packages
|
||||
|
@ -110,8 +111,8 @@ when "ubuntu"
|
|||
cwd File.join("", "tmp")
|
||||
user node[:deployment][:user]
|
||||
code <<-EOH
|
||||
tar xzf lua-cjson-1.0.3.tar.gz
|
||||
cd lua-cjson-1.0.3
|
||||
tar xzf #{lua_cjson_tarball}
|
||||
cd mpx-lua-cjson-ddbb686
|
||||
sed 's!^PREFIX ?=.*!PREFIX ?='#{lua_path}'!' Makefile > tmp
|
||||
mv tmp Makefile
|
||||
make
|
||||
|
|
Загрузка…
Ссылка в новой задаче