Keyword cleanup

[oweals/karmaworld.git] / README.md

diff --git a/README.md b/README.md
index cbd6365961b8af408b71f74b6035b66cb1cc1e45..202bc998e32da24c1fee8195d78d24debed8e68f 100644 (file)
--- a/README.md
+++ b/README.md
@@ -256,23 +256,27 @@ not generally be needed.
    On a Debian system supporting Apt, this can be done with:
 ```
     sudo apt-get install python-pip postgresql python-virtualenv nginx \
-    virtualenvwrapper git libxml2-dev p7zip-full \
+    virtualenvwrapper git libxml2-dev p7zip-full libffi-dev \
     postgresql-server-dev-9.1 libxslt1-dev \
     libmemcached-dev python-dev rabbitmq-server \
     cmake libpng-dev libjpeg-dev libgtk2.0-dev \
     pkg-config libfontconfig1-dev autoconf libtool
 
     wget http://poppler.freedesktop.org/poppler-0.24.4.tar.xz
-    tar xf poppler-0.24.4.tar.gz
+    tar xf poppler-0.24.4.tar.xz
+    cd poppler-0.24.4
     ./configure --prefix=/usr --enable-xpdf-headers
     make
     sudo make install
+    cd ~/
 
     git clone https://github.com/fontforge/fontforge.git
-    ./autogen.sh
+    cd fontforge
+    ./bootstrap
     ./configure --prefix=/usr
     make
     sudo make install
+    cd ~/
 
     git clone https://github.com/charlesconnell/pdf2htmlEX.git
     cd pdf2htmlEX
@@ -310,13 +314,25 @@ not generally be needed.
 
         server {
             listen 80;
-            listen 443 ssl;
+            server_name localhost;
+            return 301 https://$host$request_uri;
+        }
+
+        server {
+            listen 443;
+            ssl on;
             server_name localhost;
             client_max_body_size 20M;
         
             location / {
                 # pass traffic through to gunicorn
                 proxy_pass http://127.0.0.1:8000;
+                # pass HTTP(S) status through to Django
+                proxy_set_header X-Forwarded-SSL $https;
+                proxy_set_header X-Forwarded-Protocol $scheme;
+                proxy_set_header X-Forwarded-Proto $scheme;
+                # pass nginx site back to Django
+                proxy_set_header Host $http_host;
             }
         }
 
@@ -406,17 +422,20 @@ to run Fabric against the virtual machine.
 You will need to setup the host machine with the proper SSH credentials to
 access the virtual machine. This is done by running `vagrant ssh-config` from
 `{project_root}` and copying the results into your SSH configuration file
-(usually found at `~/.ssh/config`).
+(usually found at `~/.ssh/config`). This can be done more simply by typing this
+on the host machine:
+
+        vagrant ssh-config --host karmavm >> ~/.ssh/config
 
 The VM will, by default, route its SSH connection through localhost port 2222
 on the host machine and the base user with be vagrant. Point Fabric there when
 running fab commands from `{project_root}`. So the command will look like this:
 
-        fab -H 127.0.0.1 --port=2222 -u vagrant <commands>
+        fab -H karmavm <commands>
 
 In unix, it might be convenient to create and use an alias like so:
 
-        alias vmfab='fab -H 127.0.0.1 --port=2222 -u vagrant'
+        alias vmfab='fab -H karmavm'
         vmfab <commands>
 
 Removing a unix alias is done with `unalias`.