From 9b78b0a5f5bfe57a76989f70dea218d3f71ae66e Mon Sep 17 00:00:00 2001
From: Bruno Wagner <bwagner@riseup.net>
Date: Mon, 4 Jan 2016 20:22:36 -0200
Subject: 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
---
 Vagrantfile                                                    | 6 ------
 debian/control                                                 | 2 +-
 provisioning/modules/pixelated/files/apt/jessie-backports.list | 2 ++
 provisioning/modules/pixelated/files/apt/wheezy-backports.list | 2 --
 provisioning/modules/pixelated/manifests/apt.pp                | 6 +++---
 provisioning/modules/pixelated/manifests/source.pp             | 3 +--
 provisioning/modules/pixelated/manifests/source/npm.pp         | 2 +-
 7 files changed, 8 insertions(+), 15 deletions(-)
 create mode 100644 provisioning/modules/pixelated/files/apt/jessie-backports.list
 delete mode 100644 provisioning/modules/pixelated/files/apt/wheezy-backports.list

diff --git a/Vagrantfile b/Vagrantfile
index 30e8c89b..4102c424 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -3,12 +3,6 @@
 
 VAGRANTFILE_API_VERSION = "2"
 
-unless Vagrant.has_plugin?('vagrant-vbguest')
-  system "vagrant plugin install vagrant-vbguest"
-  puts "Restarting vagrant process..."
-  exec "vagrant #{ARGV.join' '}"
-end
-
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.box = "LEAP/jessie"
 
diff --git a/debian/control b/debian/control
index f26c77e7..867d8e22 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: pixelated-user-agent
 Maintainer: Pixelated Team <pixelated-team@thoughtworks.com>
 Section: python
 Priority: optional
-Build-Depends: python-setuptools (>= 0.6b3), python-all (>= 2.6.6-3), debhelper (>= 7.4.3), ruby-compass, nodejs, nodejs-legacy, build-essential, libffi-dev, python-dev, pixpybuild
+Build-Depends: python-setuptools (>= 0.6b3), python-all (>= 2.6.6-3), debhelper (>= 7.4.3), ruby-compass, nodejs, nodejs, build-essential, libffi-dev, python-dev, pixpybuild
 Standards-Version: 3.9.1
 Homepage: http://pixelated-project.org
 Vcs-Git: https://github.com/pixelated-project/pixelated-user-agent.git
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'];
   }
 }
-- 
cgit v1.2.3