Fixed Apache settings for new Nailgun

cookbooks/nailgun/recipes/deps.rb

@@ -1,9 +1,5 @@
 include_recipe "python"
 
-virtualenv "#{node[:nailgun][:venv]}" do
-  site_packages false
-end
-
 ['libxml2-dev', 'python-dev', 'python-paramiko', 'ruby-httpclient'].each do |deb|
   package deb do
     action :install
@@ -26,7 +22,7 @@ end
   'kombu' => '2.1.8',
   'nose' => '1.1.2',
 }.each do |package, version|
-  local_python_pip package do
+  python_pip package do
     version version
     virtualenv node.nailgun.venv
   end

cookbooks/nailgun/templates/default/apache2-site.conf.erb

@@ -2,14 +2,14 @@ Listen 8000
 <VirtualHost *:8000>
   WSGIProcessGroup nailgun
   WSGIDaemonProcess nailgun user=<%= node.nailgun.user %> group=<%= node.nailgun.group %> python-path=<%= node.nailgun.root %>
-  Alias /static/ <%= node.nailgun.root %>/nailgun/static/
+  Alias /static/ <%= node.nailgun.root %>/static/
 
-  <Directory <%= node.nailgun.root %>/nailgun/static>
+  <Directory <%= node.nailgun.root %>/static>
     Order deny,allow
     Allow from all
   </Directory>
 
-  WSGIScriptAlias / <%= node.nailgun.root %>/nailgun/wsgi.py
+  WSGIScriptAlias / <%= node.nailgun.root %>/wsgi.py
 
   LogLevel debug
 </VirtualHost>

nailgun/wsgi.py

@@ -0,0 +1,16 @@
+import os
+import sys
+
+import web
+
+curdir = os.path.dirname(__file__)
+sys.path.insert(0, curdir)
+
+from api.handlers import check_client_content_type
+from db import load_db_driver
+from urls import urls
+
+app = web.application(urls, locals())
+app.add_processor(load_db_driver)
+app.add_processor(check_client_content_type)
+application = app.wsgifunc()