Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move apt recipe requirement to install from package #61

Merged
merged 1 commit into from Mar 4, 2014
Merged

Move apt recipe requirement to install from package #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Expand Up @@ -16,8 +16,8 @@ REQUIREMENTS

## Cookbooks:

* build-essential
* apt
* build-essential (when installing from source)
* apt or yum (when installing from package)

Opscode cookbooks (http://github.com/opscode/cookbooks/tree/master)

Expand Down
4 changes: 0 additions & 4 deletions recipes/default.rb
View file
Open in desktop
Expand Up @@ -17,9 +17,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
case node['platform_family']
when "debian"
include_recipe "apt"
end

include_recipe "nodejs::install_from_#{node['nodejs']['install_method']}"
1 change: 1 addition & 0 deletions recipes/install_from_package.rb
View file
Open in desktop
Expand Up @@ -22,6 +22,7 @@

case node['platform_family']
when 'debian'
include_recipe "apt"
if node['nodejs']['legacy_packages'] == true
repo = 'http://ppa.launchpad.net/chris-lea/node.js-legacy/ubuntu'
packages = %w{ nodejs npm }
Expand Down