Add Postgres support to Vagrant machine

Makefile

@@ -42,6 +42,8 @@ i18n:
 
 puppet:
 	# Install puppet modules required to set-up a Vagrant box
+	rm -rf sites/puppet/modules/*
 	puppet module install --target-dir sites/puppet/modules/ saz-memcached -v 2.0.2
+	git clone git://github.com/akumria/puppet-postgresql.git sites/puppet/modules/postgresql
 	git clone git://github.com/uggedal/puppet-module-python.git sites/puppet/modules/python
 	git clone git://github.com/codeinthehole/puppet-userconfig.git sites/puppet/modules/userconfig

sites/puppet/manifests/site.pp

@@ -3,12 +3,49 @@ Exec {
 	path => "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
 }
 
+class python_dependencies {
+	exec {"update-packages":
+		command => "apt-get update",
+	}
+    $packages = [
+		"build-essential",
+		"python-setuptools",
+		"python-imaging",
+		"python-memcache",
+		"postgresql-server-dev-9.1",
+    ]
+    package {
+        $packages: ensure => installed,
+		require => Exec["update-packages"]
+    }
+}
+
 node precise64 {
+
+	include python_dependencies
 	include userconfig
 
 	# Memcached
 	class {"memcached": max_memory => 64 }
 
+	# Postgres
+	$user = "oscar_user"
+	$password = "oscar_password"
+	$database_name = "oscar_vagrant"
+	class {"postgresql::server": }
+	pg_user {$user:
+		ensure => present,
+		password => $password,
+		createdb => true,
+		require => Class["postgresql::server"],
+	}
+	pg_database {$database_name:
+		ensure => present,
+		owner => $user,
+		require => [Pg_user[$user]],
+		encoding => "UTF8",
+	}
+
 	# Python
 	# - set-up a virtualenv
 	# - install testing requirements
@@ -20,7 +57,7 @@ node precise64 {
 	    requirements => "/vagrant/requirements.txt"
 	}
     exec {"install-oscar":
-	    command => "cd /vagrant && $virtualenv/bin/python setup.py develop",
+	    command => "$virtualenv/bin/python setup.py develop",
 		require => Python::Venv::Isolate[$virtualenv]
 	}
 }

sites/sandbox/settings_postgres.py

@@ -1,10 +1,12 @@
+from settings import *
+
 DATABASES = {
     'default': {
-        'ENGINE': 'django.contrib.gis.db.backends.postgis',
-        'NAME': 'oscar',
-        'USER': 'oscar_vagrant',
+        'ENGINE': 'django.db.backends.postgresql_psycopg2',
+        'NAME': 'oscar_vagrant',
+        'USER': 'oscar_user',
         'PASSWORD': 'oscar_password',
-        'HOST': '',
+        'HOST': '127.0.0.1',
         'PORT': '',
     }
 }