remove dependency on apache/nginx by using native http from uwsgi

wr0ngway · Feb 8, 2013 · abd0628 · abd0628
1 parent 9955657
commit abd0628
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 92 deletions.
diff --git a/templates/graphite/config/rubber/role/graphite_web/graphite-vhost.conf b/templates/graphite/config/rubber/role/graphite_web/graphite-vhost.conf
diff --git a/templates/graphite/config/rubber/role/graphite_web/uwsgi.ini b/templates/graphite/config/rubber/role/graphite_web/uwsgi.ini
@@ -3,11 +3,11 @@
 %>
 
 [uwsgi]
+http=:<%= rubber_env.graphite_web_port %>
 chdir=/opt/graphite/webapp
 wsgi-file=/opt/graphite/conf/graphite.wsgi
 master=True
 pidfile=/var/run/graphite-web.pid
-socket=:3031
 processes=4
 die-on-term=True
 vacuum=True

diff --git a/templates/graphite/config/rubber/role/nginx/graphite_web.conf b/templates/graphite/config/rubber/role/nginx/graphite_web.conf
diff --git a/templates/graphite/config/rubber/rubber-graphite.yml b/templates/graphite/config/rubber/rubber-graphite.yml
@@ -19,6 +19,6 @@ web_tools_proxies:
 
 roles:
   graphite_web:
-    packages: [python-django, python-django-tagging, python-cairo, python-memcache, memcached, uwsgi, uwsgi-plugin-python, sqlite3, bzr, zip]
+    packages: [python-django, python-django-tagging, python-cairo, python-memcache, memcached, uwsgi, uwsgi-plugin-python, uwsgi-plugin-http, sqlite3, bzr, zip]
   collectd:
     packages: [libperl-dev]