Merge branch 'release/1.23.05'

Vagrantfile

@@ -22,5 +22,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.provision :shell, path: "provision/bootstrap-python.sh"
   config.vm.provision :shell, path: "provision/bootstrap-config.sh"
   config.vm.provision :shell, path: "provision/bootstrap-postgres.sh"
+  config.vm.provision :shell, path: "provision/bootstrap-nginx.sh"
 
 end

blockbuster/__init__.py

@@ -1,5 +1,5 @@
 __author__ = 'matt'
-__version__ = '1.23.04'
+__version__ = '1.23.05'
 __db_schema_version__ = '1.23.00'
 
 from flask import Flask

provision/bootstrap-nginx.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+# Configure the Nginx server
+
+echo "Removing default site configuration for Nginx"
+rm /etc/nginx/sites-enabled/default
+
+echo "Seeding Nginx site configuration for blockbuster-server"
+cd /etc/nginx/sites-enabled
+
+if [ -e "blockbuster-server" ]
+then
+  echo "NO CHANGE - blockbuster-server site file already present"
+else
+	cp /vagrant/provision/nginx/blockbuster-server /etc/nginx/sites-available/
+  	echo "Copying blockbuster-server site config into sites-available"
+  	ln -s /etc/nginx/sites-available/blockbuster-server /etc/nginx/sites-enabled/blockbuster-server
+fi
+
+echo "Restarting Nginx"
+service nginx reload

provision/nginx/blockbuster-server

@@ -0,0 +1,23 @@
+server {
+
+    listen 80;
+    server_name localhost;
+
+    access_log            /var/log/nginx/blockbuster.access.log;
+
+    location /app {
+	alias /var/www/blockbuster-app/app;
+    }
+
+    location / {
+
+      proxy_set_header        Host $host;
+      proxy_set_header        X-Real-IP $remote_addr;
+      proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_set_header        X-Forwarded-Proto $scheme;
+      proxy_http_version      1.1;
+      proxy_set_header        Connection "";
+      proxy_pass              http://localhost:8000;
+
+    }
+  }

requirements.txt

@@ -14,6 +14,7 @@ certifi==14.05.14
 cffi==0.8.2
 cryptography==0.4
 flower==0.7.2
+gunicorn==19.1.1
 httplib2==0.9
 itsdangerous==0.24
 kombu==3.0.23

run.py

@@ -3,9 +3,6 @@
 import datetime
 
 import blockbuster
-import blockbuster.bb_logging
-import blockbuster.config
-import blockbuster.bb_auditlogger
 
 blockbuster.app.debug = blockbuster.config.debug_mode