From 3a1cad71054cca6708df5bffd0390b4ac7a854d7 Mon Sep 17 00:00:00 2001
From: Dorian Pula <dorian.pula@amber-penguin-software.ca>
Date: Tue, 14 Jul 2015 08:28:56 -0400
Subject: [PATCH] Add additional variables to allow for more configurability.

---
 README.md         | 4 ++++
 defaults/main.yml | 7 +++++--
 meta/main.yml     | 3 +--
 vars/main.yml     | 5 +++--
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index cfe18da..35e3b22 100644
--- a/README.md
+++ b/README.md
@@ -36,10 +36,14 @@ role).
             rookeries_environ_type: prod
             rookeries_package_path: "{{ rookeries_package }}"
             rookeries_app_hostname: rookeries.org
+            
+*TODO: Add in section for description of symlink enabled deployments.*
 
 Role Variables
 --------------
 
+*TODO: A description of newer role variables for version number and app name*
+
 - rookeries_db:
     - This configures database soecific inforaation
     - keys:
diff --git a/defaults/main.yml b/defaults/main.yml
index 6d5646b..179b80e 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -10,13 +10,16 @@ rookeries_db:
     host: localhost
     port: 3306
 
-# Name of the rookeries app
-rookeries_app_name: rookeries
 
 # The mode of the setup.  Setting to "dev" enables the use of a SMTP fake server to help with development.
 rookeries_environ_type: dev
 
+# TODO Clean up and simplify the configuration.
+# Name of the rookeries app
+rookeries_app_name: rookeries
+rookeries_version: 0.4.9
 rookeries_app_hostname: localhost
+rookeries_local_uwsgi_port: 8001
 
 # The default configuration for running rookeries
 rookeries_app_config:
diff --git a/meta/main.yml b/meta/main.yml
index 908009a..60cca1f 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -8,7 +8,6 @@ galaxy_info:
   platforms:
   - name: Ubuntu
     versions:
-    - saucy
     - trusty
   categories:
   - development
@@ -17,6 +16,6 @@ dependencies:
   - { role: dorianpula.nginx-uwsgi-supervisor,
       app_name: "{{ rookeries_app_name }}",
       app_nginx_hostname: "{{ rookeries_app_hostname }}",
-      app_uwsgi_port: 8001,
+      app_uwsgi_port: "{{ rookeries_local_uwsgi_port }}",
       app_uwsgi_executable: "rookeries:make_rookeries_app()",
       app_uwsgi_envs: "{{ rookeries_app_config }}"}
diff --git a/vars/main.yml b/vars/main.yml
index 8767dd9..01dda82 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -3,8 +3,9 @@
 app_name: "{{ rookeries_app_name }}"
 
 # Introduced from deployment playbook
-rookeries_venv: "{{ virtualenv_root_path }}/rookeries"
-rookeries_package: rookeries-0.5.0.tar.bz2
+rookeries_venv: "{{ virtualenv_root_path }}/{{ rookeries_app_name }}"
+
+rookeries_package: "{{ rookeries_app_name }}-{{ rookeries_version }}.tar.bz2"
 rookeries_package_path: "{{ rookeries_package }}"
 
 # Extra virtualenv if working in a dev environment to provide the mailsink testing server