diff options
| author | Bruno Wagner <bwagner@riseup.net> | 2016-01-04 20:22:36 -0200 |
|---|---|---|
| committer | Bruno Wagner <bwagner@riseup.net> | 2016-01-04 20:22:36 -0200 |
| commit | 9b78b0a5f5bfe57a76989f70dea218d3f71ae66e (patch) | |
| tree | 705fd094e253c0c8bc2e349eff1c240e8aeb1f7c /provisioning/modules | |
| parent | 305e4bcc27bea881523b15aee4896e51e5aca4d3 (diff) | |
Changed wheezy backports to jessie
Changed to jessie backports as we are using that now.
Also adapted the nodejs_legacy package calls to nodejs,
that's the name of the package on jessie
Diffstat (limited to 'provisioning/modules')
5 files changed, 7 insertions, 8 deletions
diff --git a/provisioning/modules/pixelated/files/apt/jessie-backports.list b/provisioning/modules/pixelated/files/apt/jessie-backports.list new file mode 100644 index 00000000..2bd7c93b --- /dev/null +++ b/provisioning/modules/pixelated/files/apt/jessie-backports.list @@ -0,0 +1,2 @@ +deb http://http.debian.net/debian jessie-backports main +deb-src http://http.debian.net/debian jessie-backports main diff --git a/provisioning/modules/pixelated/files/apt/wheezy-backports.list b/provisioning/modules/pixelated/files/apt/wheezy-backports.list deleted file mode 100644 index ee422fae..00000000 --- a/provisioning/modules/pixelated/files/apt/wheezy-backports.list +++ /dev/null @@ -1,2 +0,0 @@ -deb http://http.debian.net/debian wheezy-backports main -deb-src http://http.debian.net/debian wheezy-backports main diff --git a/provisioning/modules/pixelated/manifests/apt.pp b/provisioning/modules/pixelated/manifests/apt.pp index 793518fd..1c4e06f6 100644 --- a/provisioning/modules/pixelated/manifests/apt.pp +++ b/provisioning/modules/pixelated/manifests/apt.pp @@ -1,9 +1,9 @@ # add the pixelated sources needed to install everything class pixelated::apt { - # wheezy backports - file { '/etc/apt/sources.list.d/wheezy-backports.list': - source => 'puppet:///modules/pixelated/apt/wheezy-backports.list', + # jessie backports + file { '/etc/apt/sources.list.d/jessie-backports.list': + source => 'puppet:///modules/pixelated/apt/jessie-backports.list', owner => 'root', notify => Exec['apt_get_update'], } diff --git a/provisioning/modules/pixelated/manifests/source.pp b/provisioning/modules/pixelated/manifests/source.pp index 8dd9a1d0..62b77638 100644 --- a/provisioning/modules/pixelated/manifests/source.pp +++ b/provisioning/modules/pixelated/manifests/source.pp @@ -3,8 +3,7 @@ class pixelated::source { package { [ 'git', - 'bzr', - 'nodejs-legacy', + 'nodejs', 'python-dev', 'python-virtualenv', 'libffi-dev', diff --git a/provisioning/modules/pixelated/manifests/source/npm.pp b/provisioning/modules/pixelated/manifests/source/npm.pp index 8926d6fd..acc04401 100644 --- a/provisioning/modules/pixelated/manifests/source/npm.pp +++ b/provisioning/modules/pixelated/manifests/source/npm.pp @@ -4,6 +4,6 @@ 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-legacy']; + require => Package['nodejs']; } } |