From f9ce0ff7c0b785a42800282c8c8419931c105d1b Mon Sep 17 00:00:00 2001
From: Brett Costabile <kaezontpa@gmail.com>
Date: Thu, 5 Nov 2015 20:16:11 -0500
Subject: [PATCH] Postgres

Added lines to try and get posrgresql installed for testing.
Changed the required version of django back to 1.6.5 because 1.7.0
should not be in production.
---
 requirements.txt     |  4 +++-
 vagrant/Vagrantfile  |  7 ++++++-
 vagrant/bootstrap.sh | 24 ++++++++++++++++++++----
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 29f6b32c..41f248ad 100755
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,7 @@
 # Python Stuff # - see bootstrap.sh
 mysql-python
+mysqlclient
+psycopg2
 evelink
 dnspython
 passlib
@@ -7,7 +9,7 @@ xmpppy==0.5.0rc1
 # python-openfire==0.2.3-beta
 
 # Django Stuff #
-django==1.7.0
+django==1.6.5
 django-evolution
 django-bootstrap-form
 django-celery
diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile
index 91d29ec3..938bdca5 100644
--- a/vagrant/Vagrantfile
+++ b/vagrant/Vagrantfile
@@ -16,7 +16,12 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # CD to install its guest extension from.
 
   # Create a forwarded port mapping which allows access to a specific port
-  # within the machine from a port on the host machine. 
+  # within the machine from a port on the host machine.
+  config.vm.provider "virtualbox" do |v|
+    v.memory = 1024
+    v.cpus = 2
+  end
+  
   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
diff --git a/vagrant/bootstrap.sh b/vagrant/bootstrap.sh
index b933faf5..14188278 100755
--- a/vagrant/bootstrap.sh
+++ b/vagrant/bootstrap.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+export DEBIAN_FRONTEND=noninteractive
 
 sudo add-apt-repository ppa:upubuntu-com/xampp
 
@@ -10,16 +11,31 @@ 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
+sudo apt-get -y install mysql-server mysql-client libmysqlclient-dev
 
 #Python 3 stuff
 sudo apt-get -y install python-software-properties
 sudo add-apt-repository ppa:fkrull/deadsnakes
 sudo apt-get -y update
-sudo apt-get -y install python3.3
+sudo apt-get -y install python3.4
 
 #virtualenv stuff
 sudo apt-get -y install python-virtualenv
+sudo virtualenv -p /usr/bin/python3.4 /opt/allianceVenv
+
+#Postgresql stuff
+sudo apt-get -y postgresql-9.1 libpq5 libpq-dev postgresql-client-9.1 postgresql-common ssl-cert postgresql-contrib-9.1 postgresql-server-dev-9.1
+sudo apt-get -y install -f
+cat << EOF | su - postgres -c psql
+-- Create database user:
+CREATE USER vagrant WITH PASSWORD 'password';
+GRANT ALL PRIVILEGES ON DATABASE alliance% to vagrant;
+EOF
+createdb alliance_auth
+createdb alliance_forum
+createdb alliance_jabber
+createdb alliance_mumble
+createdb alliance_killboard
 
 cd /vagrant/
 
@@ -28,8 +44,6 @@ sudo pip install --upgrade pip
 # Pip moved location after upgrade from 1.0
 sudo ln -s /usr/local/bin/pip /usr/bin/pip 2>/dev/null
 
-sudo apt-get -y install libmysqlclient-dev 
-
 sudo pip install --allow-external mysql-connector-python mysql-connector-python
 sudo pip install --allow-external python-openfire python-openfire==0.2.3-beta
 sudo pip install https://github.com/eve-val/evelink/zipball/master
@@ -60,7 +74,9 @@ sudo mysqladmin -p$MYSQL_ROOT_PASS flush-privileges
 
 sudo apt-get -y install rabbitmq-server
 
+source /opt/allianceVenv/bin/activate
 sudo pip install -r requirements.txt
+deactivate
 
 chmod +x *.sh