summaryrefslogtreecommitdiff
path: root/provisioning
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2016-02-08 18:22:49 +0100
committervarac <varacanero@zeromail.org>2016-02-08 18:22:49 +0100
commitffb88d944784b30d5d2daacd90f387cca4e0cfaf (patch)
treef1cbca11bfb12dcef48f89b6d77a03e9e7715ca2 /provisioning
parent596dde6fe889fb2c729612d0430a6d0d56d2db4d (diff)
Install npm from debian package archive
we don't need to install npm from source anymore since jessie
Diffstat (limited to 'provisioning')
-rw-r--r--provisioning/modules/pixelated/manifests/source.pp3
-rw-r--r--provisioning/modules/pixelated/manifests/source/npm.pp9
2 files changed, 1 insertions, 11 deletions
diff --git a/provisioning/modules/pixelated/manifests/source.pp b/provisioning/modules/pixelated/manifests/source.pp
index 49be7a01..c42a30b1 100644
--- a/provisioning/modules/pixelated/manifests/source.pp
+++ b/provisioning/modules/pixelated/manifests/source.pp
@@ -6,6 +6,7 @@ class pixelated::source {
'git',
'nodejs',
'nodejs-legacy',
+ 'npm',
'python-dev',
'virtualenv',
'libffi-dev',
@@ -18,8 +19,6 @@ class pixelated::source {
ensure => latest
}
- include pixelated::source::npm
-
stage { 'install_pixelated': }
class { 'pixelated::source::install_useragent' :
diff --git a/provisioning/modules/pixelated/manifests/source/npm.pp b/provisioning/modules/pixelated/manifests/source/npm.pp
deleted file mode 100644
index 9973df5c..00000000
--- a/provisioning/modules/pixelated/manifests/source/npm.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# installs npm from source
-class pixelated::source::npm {
-
- exec { 'install_npm':
- command => '/usr/bin/curl -s -L https://npmjs.org/install.sh | /bin/sh',
- unless => '/usr/bin/test -e /usr/bin/npm',
- require => [Package['nodejs'], Package['nodejs-legacy']];
- }
-}