dns: upgrade dnscontrol to 4.14.1

[chef.git] / cookbooks / nodejs / recipes / default.rb

diff --git a/cookbooks/nodejs/recipes/default.rb b/cookbooks/nodejs/recipes/default.rb
index 2fa43d63172477f0be25133482331621ab921b05..9483d5893f9f98d0ebf824b98d8f480355ff01ad 100644 (file)
--- a/cookbooks/nodejs/recipes/default.rb
+++ b/cookbooks/nodejs/recipes/default.rb
@@ -1,14 +1,14 @@
 #
-# Cookbook Name:: nodejs
+# Cookbook:: nodejs
 # Recipe:: default
 #
-# Copyright 2013, OpenStreetMap Foundation
+# Copyright:: 2013, OpenStreetMap Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,11 +17,12 @@
 # limitations under the License.
 #
 
-package "nodejs"
-package "npm"
-package "g++"
-package "make"
+include_recipe "apt::nodesource"
+include_recipe "apt::yarn"
 
-if node[:lsb][:release].to_f >= 14.04
-  package "nodejs-legacy"
-end
+package %w[
+  nodejs
+  yarn
+  g++
+  make
+]