From ad04c4cc017b7f249e52d46a7b0b91c30990948e Mon Sep 17 00:00:00 2001
From: Dorian Pula <dorian.pula@amber-penguin-software.ca>
Date: Wed, 14 Jan 2015 08:33:29 -0500
Subject: [PATCH] Add parameters to uwsgi app role for deployment.  Remove
 duplicate code.

---
 deployment.yaml       |  1 -
 deployment/uwsgi.yaml | 18 ------------------
 pre_deployment.yaml   |  3 ++-
 3 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 deployment/uwsgi.yaml

diff --git a/deployment.yaml b/deployment.yaml
index 68b5aa0..b7e68e4 100644
--- a/deployment.yaml
+++ b/deployment.yaml
@@ -1,4 +1,3 @@
 ---
 - include: deployment/rookeries_install.yaml
-- include: deployment/uwsgi.yaml
 - include: deployment/email_server.yaml
diff --git a/deployment/uwsgi.yaml b/deployment/uwsgi.yaml
deleted file mode 100644
index 24770b2..0000000
--- a/deployment/uwsgi.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- hosts: all
-  vars:
-      web_server_home: /srv/www
-      web_server_group: www-data
-      uwsgi_venv: "{{ web_server_home }}/virtualenvs/uwsgi"
-      uwsgi_config: "{{ web_server_home }}/config/uwsgi"
-      rookeries_uwsgi_ini: rookeries-uwsgi.ini
-  tasks:
-
-     - name: install uwsgi server
-       pip: name=uwsgi virtualenv={{ uwsgi_venv }} version=2.0
-
-     - name: upload rookeries configuration
-       copy: src=../config/uwsgi/{{ rookeries_uwsgi_ini }} dest={{ uwsgi_config }}
-
-     - name: restart uwsgi server
-       supervisorctl: name=uwsgi state=restarted config=/etc/supervisor/supervisor.conf
diff --git a/pre_deployment.yaml b/pre_deployment.yaml
index 5fa3b3f..ff3168a 100644
--- a/pre_deployment.yaml
+++ b/pre_deployment.yaml
@@ -3,7 +3,8 @@
   sudo: yes
 
   roles:
-      - ansible-nginx-uwsgi-supervisor
+      - { role: ansible-nginx-uwsgi-supervisor, app_name: rookeries, nginx_hostname: localhost,
+          uwsgi_port: 8001, uwsgi_app_executable: "rookeries:make_rookeries_app()" }
   tasks:
       - include: pre_deployment/base_linux.yaml
       - include: pre_deployment/mysql_db.yaml