redis #4

Merged
wmantly merged 7 commits from redis into master 2019-05-28 02:43:27 +00:00
2 changed files with 26 additions and 10 deletions
Showing only changes of commit f9a2f0aaac - Show all commits

View File

@ -1,3 +1,5 @@
node.default['nodejs']['env_path'] = "/opt/theta42/#{node['app']['name']}/env/node"
default['NodeJS']['version'] = 8 default['NodeJS']['version'] = 8
default['NodeJS']['working-dir'] = 'src/nodejs' default['NodeJS']['working-dir'] = 'src/nodejs'
default['NodeJS']['exec_file'] = 'app.js' default['NodeJS']['exec_file'] = 'app.js'

View File

@ -11,33 +11,47 @@ version = {
} }
} }
unless node['node']['working-dir'][0] == '/' unless node['nodejs']['working-dir'][0] == '/'
node.override['node']['working-dir'] = "#{node['working-dir']}/#{node['node']['working-dir']}" node.override['nodejs']['working-dir'] = "#{node['working-dir']}/#{node['nodejs']['working-dir']}"
end end
unless node['node']['version'] unless node['nodejs']['install_version']
node.default['node']['version'] = 8 node.default['nodejs']['install_version'] = 8
end end
unless version.key?(node['node']['version']) unless version.key?(node['nodejs']['install_version'])
raise <<~EOH raise <<~EOH
Unsupported NodeJS version #{node['node']['version']}. Unsupported NodeJS version #{node['nodejs']['install_version']}.
Supports #{version.keys}. Supports #{version.keys}.
EOH EOH
end end
set_version = version[node['node']['version']] set_version = version[node['nodejs']['install_version']]
node.default['nodejs']['install_method'] = 'binary' node.default['nodejs']['install_method'] = 'binary'
node.default['nodejs']['version'] = set_version['version'] node.default['nodejs']['version'] = set_version['version'].to_str
node.default['nodejs']['binary']['url'] = set_version['url'] node.default['nodejs']['binary']['url'] = set_version['url']
node.default['nodejs']['binary']['checksum'] = set_version['checksum'] node.default['nodejs']['binary']['checksum'] = set_version['checksum']
node.default['nodejs']['env_path'] = "/opt/theta42/#{node['app']['name']}/env/node"
include_recipe "nodejs" include_recipe "nodejs"
directory node['nodejs']['env_path'] do
recursive true
end
file "#{node['nodejs']['env_path']}/package.json" do
owner 'root'
group 'root'
mode 0755
content ::File.open("#{node['nodejs']['working-dir']}/package.json").read
action :create
end
execute 'Install NPM package.json' do execute 'Install NPM package.json' do
cwd node['node']['working-dir'] cwd node['nodejs']['env_path']
command "npm --prefix \"#{node['node']['working-dir']}\" install" command "npm --prefix #{node['nodejs']['env_path']} install #{node['nodejs']['env_path']}"
end end
directory "/var/log/node/#{node['app']['name']}" do directory "/var/log/node/#{node['app']['name']}" do