vagrant works

ops/cookbooks/vendor/t42-common/attributes/nodejs.rb

@@ -1,5 +1,6 @@
 default['nodejs']['env_path'] = "/opt/theta42/#{node['app']['name']}/env/node"
-default['NodeJS']['install_version'] = 12
-default['NodeJS']['working-dir'] = 'src/nodejs'
-default['NodeJS']['exec_file'] = 'app.js'
-default['NodeJS']['port'] = '8001'
+default['nodeJS']['install_version'] = 12
+default['nodeJS']['working-dir'] = 'src/nodejs'
+default['nodeJS']['exec_file'] = 'app.js'
+default['nodeJS']['port'] = '3000'
+default['nodeJS']['service'] = false

ops/cookbooks/vendor/t42-common/metadata.json

@@ -19,7 +19,7 @@
   "recipes": {
 
   },
-  "version": "0.4.8",
+  "version": "0.6.1",
   "source_url": "",
   "issues_url": "",
   "privacy": false,

ops/cookbooks/vendor/t42-common/metadata.rb

@@ -4,7 +4,7 @@ maintainer_email 'you@example.com'
 license 'All Rights Reserved'
 description 'Installs/Configures t42-common'
 long_description 'Installs/Configures t42-common'
-version '0.4.8'
+version '0.6.1'
 chef_version '>= 13.0'
 
 depends 'nodejs'

ops/cookbooks/vendor/t42-common/recipes/nodejs.rb

@@ -34,7 +34,7 @@ node.default['nodejs']['version'] = set_version['version'].to_str
 node.default['nodejs']['binary']['url'] = set_version['url']
 node.default['nodejs']['binary']['checksum'] = set_version['checksum']
 
-node.default['nodejs']['env_path'] = "/home/#{node['app']['run_user']}/app/#{node['app']['name']}/env/node"
+node.default['nodejs']['env_path'] = "/opt/theta42/app/#{node['app']['name']}/env/node"
 
 include_recipe "nodejs"
 
@@ -53,14 +53,46 @@ file "#{node['nodejs']['env_path']}/package.json" do
   action :create
 end
 
+do_sudo = node['app']['run_user'] == 'root' ? 'sudo' : ''
+
 execute 'Install NPM package.json' do
 	cwd node['nodejs']['env_path']
 	user node['app']['run_user']
 	group node['app']['run_user']
-	environment ({'HOME' => "/home/#{node['app']['run_user']}"})
-	command "npm --prefix #{node['nodejs']['env_path']} --python=\"`which python2.7`\" install #{node['nodejs']['env_path']}"
+	environment ({'HOME' => node['app']['run_user'] == 'root' ? '/root/' : "/home/#{node['app']['run_user']}"})
+	command "#{do_sudo} npm --prefix #{node['nodejs']['env_path']} --python=\"`which python2.7`\" install #{node['nodejs']['env_path']}"
 end
 
 directory "/var/log/node/#{node['app']['name']}" do
+	owner node['app']['run_user']
+	group node['app']['run_user']
+	mode 0755
 	recursive true
 end
+
+bash 'Add Node path to env' do
+	code "echo 'NODE_PATH=\"#{node['nodejs']['env_path']}/node_modules\"' > /etc/environment"
+	not_if "grep NODE_PATH /etc/environment"
+end
+
+if node['nodejs']['service']
+	systemd_unit "node-#{node['app']['name']}.service" do
+	  content <<~EOU
+	    [Unit]
+	    Description=NodeJS app for #{node['app']['name']}
+	    After=network.target
+
+	    [Service]
+	    Environment=NODE_PORT=#{node['nodejs']['port']}
+	    Environment=NODE_PATH=#{node['nodejs']['env_path']}/node_modules/
+	    Type=simple
+	    WorkingDirectory=#{node['nodejs']['working-dir']}
+	    ExecStart=/usr/bin/env node #{node['nodejs']['working-dir']}/#{node['nodejs']['exec_file']}
+	    Restart=on-failure
+
+	    [Install]
+	    WantedBy=multi-user.target
+	  EOU
+	  action [:create, :enable, :start]
+	end
+end

ops/cookbooks/vendor/t42-common/recipes/openresty.rb

@@ -37,12 +37,12 @@ if node['web']['do_ssl']
 	end
 
 	template '/etc/openresty/autossl.conf' do
-		source 'autossl.conf.erb'
+		source 'openresty/autossl.conf.erb'
 	end
 end
 
 template '/etc/openresty/nginx.conf' do
-	source 'nginx.conf.erb'
+	source 'openresty/nginx.conf.erb'
 end
 
 directory '/etc/openresty/sites-enabled' do
@@ -56,9 +56,9 @@ directory '/var/log/nginx/' do
 end
 
 template '/etc/openresty/sites-enabled/host.conf' do
-	source 'host.conf.erb'
+	source 'openresty/simple-proxy.conf.erb'
 end
 
 systemd_unit 'openresty' do
 	action :reload
-end
+end