Merge pull request #3 from Kaezon/vagrant-tweaking

Vagrant tweaking

requirements.txt

@@ -1,5 +1,6 @@
 # Python Stuff # - see bootstrap.sh
 mysql-python
+mysqlclient
 evelink
 dnspython
 passlib

vagrant/Vagrantfile

@@ -17,6 +17,11 @@ 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.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

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,7 @@ 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
-
-#virtualenv stuff
-sudo apt-get -y install python-virtualenv
 
 cd /vagrant/
 
@@ -28,8 +20,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
@@ -51,8 +41,8 @@ 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 "CREATE USER 'allianceserver'@'localhost' IDENTIFIED BY 'password'"
-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 "GRANT ALL PRIVILEGES ON * . * TO 'allianceserver'@'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'";
 
@@ -72,5 +62,6 @@ echo 'Next steps:\n'
 echo '1. Adjust mysql root password if you feel so inclined.'
 echo '2. Adjust all the stuff in ./alliance_auth/settings.py.'
 echo '3. Run sudo python manage.py syncdb to set up the database tables'
-echo "4. run cd /vagrant/; ./startup.sh to start, and ./shutdown.sh to stop."
+echo '4. Run python manage.py shell < run_alliance_corp_update.py'
+echo "5. run cd /vagrant/; ./startup.sh to start, and ./shutdown.sh to stop."
 echo '--------'