From 970c9aae4710d481b8ba5ae7932ac72cafccc8c8 Mon Sep 17 00:00:00 2001
From: Mark Heiges <mheiges@uga.edu>
Date: Sat, 21 Nov 2015 21:51:05 -0500
Subject: [PATCH] variablize path to install package

---
 roles/easyredmine/templates/easyredmine.conf.j2 | 6 ------
 roles/easyredmine/templates/install_wrapper.j2  | 4 ++--
 2 files changed, 2 insertions(+), 8 deletions(-)
 delete mode 100644 roles/easyredmine/templates/easyredmine.conf.j2

diff --git a/roles/easyredmine/templates/easyredmine.conf.j2 b/roles/easyredmine/templates/easyredmine.conf.j2
deleted file mode 100644
index e47dd02..0000000
--- a/roles/easyredmine/templates/easyredmine.conf.j2
+++ /dev/null
@@ -1,6 +0,0 @@
-server {
-  listen 80;
-  server_name {{ ansible_fqdn }};
-  root {{ redmine_root_dir }}/public;
-  passenger_enabled on;
-}
diff --git a/roles/easyredmine/templates/install_wrapper.j2 b/roles/easyredmine/templates/install_wrapper.j2
index c2d5096..9f939c8 100755
--- a/roles/easyredmine/templates/install_wrapper.j2
+++ b/roles/easyredmine/templates/install_wrapper.j2
@@ -5,8 +5,8 @@
 
 set timeout -1
 
-# spawn ~/bin/redmine install /vagrant/scratch/easyredmine_package_u2072_d201511101601.zip  
-spawn /usr/local/bin/redmine install /vagrant/scratch/easyredmine_package_u2072_d201511101601.zip  
+# spawn ~/bin/redmine install {{ cache_dir }}/easyredmine_package_u2072_d201511101601.zip
+spawn /usr/local/bin/redmine install {{ cache_dir }}/easyredmine_package_u2072_d201511101601.zip
 
 expect -re {[\r\n]+Path for redmine_root}
 send "{{ redmine_root_dir }}\r"