additional dependencies and instructions for them

diff --git a/README.md b/README.md
index 6d11f81c23b539a686f9195944aa807e7c93a07d..1c643823fdc57a12e16f4de0e2a3f3f0607087da 100644 (file)
--- a/README.md
+++ b/README.md
@@ -60,6 +60,7 @@ follow the steps below.
 1. Ensure the following are installed:
    * `git`
    * `PostgreSQL` (server and client)
+   * `nginx`
    * `Python`
    * `PIP`
    * `virtualenv` and `virtualenvwrapper`
@@ -81,10 +82,13 @@ follow the steps below.
        * Ensure *.py in `secret/` are never added to the git repo. (.gitignore
          should help warn against taking this action)
 
+1. Make sure that /var/www exists, is owned by the www-data group, and that
+   the user is a member of the www-data group.
+
 1. Make sure that you're in the root of the project that you just cloned and
    run
 
-        fab here first_deploy
+        fab -H 127.0.0.1 first_deploy
 
    This will make a virtualenv, install the development dependencies and create
    the database tables.

diff --git a/Vagrantfile b/Vagrantfile
index dc458caaab3a854aff1072f1857d1785cd6581e9..d323583e19bc3bb540cafd57d82ae3f8c69cc7bf 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -14,18 +14,25 @@ VAGRANTFILE_API_VERSION = "2"
 
 # Install fabric so that the KarmaWorld fabfile may be run.
 
-# build a shell script that installs prereqs, configures the database, pulls in
-# the code from the host machine, and then runs fabric.
+# build a shell script that installs prereqs, configures the database, sets up
+# the user/group associations, pulls in the code from the host machine, and
+# then runs fabric.
 shellscript = <<SCRIPT
 apt-get update
 apt-get upgrade -y
-apt-get install -y python-pip postgresql python-virtualenv virtualenvwrapper git
+apt-get install -y python-pip postgresql python-virtualenv virtualenvwrapper \
+                   git nginx
 
 echo "CREATE USER vagrant WITH CREATEROLE LOGIN; CREATE DATABASE karmaworld OWNER vagrant;" | su postgres -c "psql"
 
+mkdir -m 775 -p /var/www
+chown -R :www-data /var/www
+usermod -a -G www-data vagrant
+
 su vagrant -c "git clone /vagrant karmaworld"
 
-pip install fabric
+# TODO run pip commands in the virtualenv
+pip install fabric fabric-virtualenv
 #su vagrant -c "cd karmaworld; fab here first_deploy"
 SCRIPT
 # end of script