Add nginx reverse proxy to apache in Vagrant VM

Accessible at port 9001.

.gitignore

@@ -44,3 +44,4 @@ sites/demo/*.sqlite
 sites/demo/assets/
 sites/demo/public/
 sites/demo/whoosh_index/
+sites/puppet/modules/

Makefile

@@ -66,8 +66,9 @@ puppet:
 	puppet module install --target-dir sites/puppet/modules/ saz-memcached -v 2.0.2
 	puppet module install --target-dir sites/puppet/modules/ puppetlabs/mysql
 	puppet module install --target-dir sites/puppet/modules/ puppetlabs/apache
+	puppet module install --target-dir sites/puppet/modules/ dhutty/nginx
 	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/puppetmodules/puppet-module-python sites/puppet/modules/python
 	git clone git://github.com/codeinthehole/puppet-userconfig.git sites/puppet/modules/userconfig
 
 css:

Vagrantfile

@@ -12,6 +12,7 @@ Vagrant::Config.run do |config|
     config.vm.box_url = "http://files.vagrantup.com/precise64.box"
 	config.vm.forward_port 8000, 8080
 	config.vm.forward_port 80, 8081
+	config.vm.forward_port 9001, 9001
 	#config.vm.boot_mode = :gui
     config.vm.provision :puppet do |puppet|
         puppet.manifests_path = "sites/puppet/manifests"

sites/puppet/manifests/site.pp

@@ -34,6 +34,23 @@ node precise64 {
 	    source => "/vagrant/sites/sandbox/deploy/apache2/vagrant.conf"
 	}
 
+	# Nginx in front of Apache
+	class { "nginx": }
+	nginx::resource::vhost { 'apache_rp':
+	  ensure => present,
+	  listen_port => 9001,
+	}
+	nginx::resource::location { 'apache-root':
+	  ensure => present,
+	  vhost => 'apache_rp',
+	  location => '/',
+	  proxy => 'http://localhost',
+	  proxy_set_headers => {
+	  'REMOTE_ADDR' => '$remote_addr',
+	  'HTTP_HOST' => '$http_host',
+	  },
+	}
+
 	# Memcached
 	class {"memcached": max_memory => 64 }
 
@@ -81,6 +98,10 @@ node precise64 {
 	    venv => $virtualenv,
 		require => Python::Venv::Isolate[$virtualenv]
 	}
+	python::pip::requirements {"/vagrant/requirements_less.txt":
+	    venv => $virtualenv,
+		require => Python::Venv::Isolate[$virtualenv]
+	}
     exec {"install-oscar":
 	    command => "$virtualenv/bin/python /vagrant/setup.py develop",
 		require => Python::Venv::Isolate[$virtualenv]