Merge branch 'develop' into radial_menus

Vagrantfile

@@ -1,6 +1,6 @@
 Vagrant::Config.run do |config|
-  config.vm.box = "arch32"
-  config.vm.box_url = "http://sirjtaa.com/files/arch32.box"
+  config.vm.box = "squeeze32"
+  config.vm.box_url = "http://mathie-vagrant-boxes.s3.amazonaws.com/debian_squeeze_32.box"
   config.vm.provision :puppet
 
   config.vm.forward_port 8080, 8080

manifests/default.pp

@@ -1,41 +1,46 @@
 #
-# General packages
+# Update the system
 #
-package { "python2":
-  ensure => "present",
-  provider => "pacman"
+exec { "backports":
+  command => "/bin/echo 'deb http://backports.debian.org/debian-backports squeeze-backports main' >> /etc/apt/sources.list",
+  user => root
 }
 
-package { "python2-pip":
-  ensure => "present",
-  require => Package['python2'],
-  provider => "pacman"
-}
-
-package { "redis":
-  ensure => present,
-  provider => "pacman"
+exec { "update1":
+  command => "/usr/bin/sudo /usr/bin/apt-get update",
+  require => Exec['backports']
 }
 
 #
-# Link execs
+# General packages
 #
-exec { "Link-python":
-  command => "/usr/bin/sudo ln /usr/bin/python2 /usr/bin/python",
-  creates => "/usr/bin/python",
-  require => Package['python2']
+package { "python":
+  ensure => "present",
+  provider => "apt",
+  require => Exec['update1']
 }
 
-exec { "Link-pip":
-  command => "/usr/bin/sudo ln /usr/bin/pip2 /usr/bin/pip",
-  creates => "/usr/bin/pip",
-  require => Package['python2-pip']
+package { "python-pip":
+  ensure => "present",
+  require => Package['python'],
+  provider => "apt",
+}
+
+package { "redis-server/squeeze-backports":
+  ensure => present,
+  provider => "apt",
+  require => Exec['update1']
 }
 
 #
 # Required python libraries
 #
 exec { "Install-Py-Libraries":
   command => "/usr/bin/sudo pip install -r /vagrant/requirements.txt",
-  require => Exec['Link-pip']
+  require => Package['python-pip']
+}
+
+exec { "Start redis":
+  command => "/usr/bin/sudo service redis-server start",
+  require => Package['redis-server/squeeze-backports']
 }