From 9d5c39caebdf8d1c02e6096c2e6ed44fbb045195 Mon Sep 17 00:00:00 2001
From: Trent Bartlem <trent.bartlem+github@gmail.com>
Date: Sun, 4 Jan 2015 23:59:18 +1000
Subject: [PATCH] updated to match new services

---
 vagrant/Vagrantfile  |  7 ++++++-
 vagrant/bootstrap.sh | 10 ++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile
index 6e463cf5..91d29ec3 100644
--- a/vagrant/Vagrantfile
+++ b/vagrant/Vagrantfile
@@ -18,7 +18,12 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # Create a forwarded port mapping which allows access to a specific port
   # within the machine from a port on the host machine. 
   config.vm.network :forwarded_port, guest: 3306, host: 3306
+  config.vm.network :forwarded_port, guest: 9090, host: 9090
+  config.vm.network :forwarded_port, guest: 8000, host: 8000
+
+  config.vm.synced_folder ".", "/vagrant", disabled: true
+  config.vm.synced_folder "../", "/vagrant"
 
   config.vm.provision :shell, :path => "bootstrap.sh"
 
-end
\ No newline at end of file
+end
diff --git a/vagrant/bootstrap.sh b/vagrant/bootstrap.sh
index 68ad5d39..d2b440a3 100755
--- a/vagrant/bootstrap.sh
+++ b/vagrant/bootstrap.sh
@@ -1,12 +1,16 @@
 #!/usr/bin/env bash
 
+sudo add-apt-repository ppa:upubuntu-com/xampp
+
 sudo apt-get update
 
 sudo apt-get clean
 
 sudo apt-get -y install libtool
+sudo apt-get -y install git
 sudo apt-get -y install python-dev libyaml-dev libffi-dev
 sudo apt-get -y install python-pip
+sudo apt-get -y install mysql-server mysql-client
 
 cd /vagrant/
 
@@ -34,10 +38,14 @@ sudo mysqladmin status -p$MYSQL_ROOT_PASS
 echo 'Creating databases and allianceauth user'
 sudo mysqladmin -p$MYSQL_ROOT_PASS create alliance_auth 
 sudo mysqladmin -p$MYSQL_ROOT_PASS create alliance_forum
+sudo mysqladmin -p$MYSQL_ROOT_PASS create alliance_jabber
 sudo mysqladmin -p$MYSQL_ROOT_PASS create alliance_mumble
+sudo mysqladmin -p$MYSQL_ROOT_PASS create alliance_killboard
 
 sudo mysql -u root -p$MYSQL_ROOT_PASS -e "CREATE USER 'allianceauth'@'localhost' IDENTIFIED BY 'allianceauth'"
 sudo mysql -u root -p$MYSQL_ROOT_PASS -e "GRANT ALL PRIVILEGES ON * . * TO 'allianceauth'@'localhost'";
+sudo mysql -u root -p$MYSQL_ROOT_PASS -e "CREATE USER 'alliancemumble'@'localhost' IDENTIFIED BY 'alliancemumble'"
+sudo mysql -u root -p$MYSQL_ROOT_PASS -e "GRANT ALL PRIVILEGES ON * . * TO 'alliancemumble'@'localhost'";
 
 sudo mysqladmin -p$MYSQL_ROOT_PASS flush-privileges
 
@@ -47,6 +55,8 @@ sudo pip install -r requirements.txt
 
 chmod +x *.sh
 
+sudo apt-get -y install xampp
+
 echo '--------'
 echo 'Almost there!'
 echo 'Next steps:\n'