From ddf16090acfac3b70d2c321a34850bad03df70ef Mon Sep 17 00:00:00 2001
From: Dorian Pula <dorian.pula@amber-penguin-software.ca>
Date: Wed, 14 Jan 2015 08:10:04 -0500
Subject: [PATCH] Split out default variables from the internal role variables
 derived from the defaults.

---
 defaults/main.yml | 14 ++++++++++++++
 vars/main.yml     |  8 --------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index e913734..8556630 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,2 +1,16 @@
 ---
 # defaults file for ansible-nginx-uwsgi-supervisor
+
+# Web root paths + app name + home
+app_name: rookeries
+web_root_path: /srv/www
+web_server_group: www-data
+app_home: "{{ web_root_path }}/{{ app_name }}_webapp"
+
+# NGINX
+nginx_hostname: localhost
+nginx_app_static: "{{ app_home }}/{{ app_name }}/static/"
+
+# UWSGI
+uwsgi_port: 8001
+uwsgi_app_executable: rookeries:make_rookeries_app()
diff --git a/vars/main.yml b/vars/main.yml
index d851a3d..32faf76 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -2,11 +2,7 @@
 # vars file for ansible-nginx-uwsgi-supervisor
 
 # Web root paths + app name + home
-app_name: rookeries
-web_root_path: /srv/www
-web_server_group: www-data
 web_user: "{{ ansible_env.SUDO_USER }}"
-app_home: "{{ web_root_path }}/{{ app_name }}_webapp"
 
 # Virtualenvs
 virtualenv_root: "{{ web_root_path }}/virtualenvs"
@@ -14,8 +10,6 @@ uwsgi_venv: "{{ virtualenv_root }}/uwsgi"
 app_venv: "{{ virtualenv_root }}/{{ app_name }}"
 
 # NGINX
-nginx_hostname: localhost
-nginx_app_static: "{{ app_home }}/{{ app_name }}/static/"
 nginx_app_conf: "{{ app_name }}_uwsgi_nginx.conf"
 
 # Supervisor
@@ -24,6 +18,4 @@ supervisor_app_config: "{{ app_name }}_supervisor.conf"
 # UWSGI
 uwsgi_config: "{{ web_root_path }}/config/uwsgi"
 uwsgi_app_ini: "{{ app_name }}_uwsgi.ini"
-uwsgi_port: 8001
 uwsgi_service_name: "{{ app_name }}_uwsgi"
-uwsgi_app_executable: rookeries:make_rookeries_app()