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"