From 2ea3e2c77ca5b8f6377a9e10d41c9e3f7d916452 Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <adellam@isti.cnr.it>
Date: Thu, 20 Dec 2018 17:55:38 +0100
Subject: [PATCH] solr: Modify the startup script so that we can change the
 installation directory.

---
 solr/tasks/main.yml            | 2 +-
 solr/{files => templates}/solr | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename solr/{files => templates}/solr (98%)

diff --git a/solr/tasks/main.yml b/solr/tasks/main.yml
index cf80b52..00f62e2 100644
--- a/solr/tasks/main.yml
+++ b/solr/tasks/main.yml
@@ -47,7 +47,7 @@
       with_items: '{{ solr_jar_files }}'
 
     - name: install the solr init script
-      copy: src=solr  dest=/etc/init.d/solr mode=0755 owner=root group=root
+      template: src=solr  dest=/etc/init.d/solr mode=0755 owner=root group=root
 
     - name: Install the solr default
       template: src=solr-default.j2 dest=/etc/default/solr.in.sh mode=0644 owner=root group=root
diff --git a/solr/files/solr b/solr/templates/solr
similarity index 98%
rename from solr/files/solr
rename to solr/templates/solr
index e73e0d6..c2bee7b 100755
--- a/solr/files/solr
+++ b/solr/templates/solr
@@ -33,7 +33,7 @@
 #   update-rc.d solr enable
 
 # Where you extracted the Solr distribution bundle
-SOLR_INSTALL_DIR="/opt/solr"
+SOLR_INSTALL_DIR="{{ solr_server_dir }}"
 
 if [ ! -d "$SOLR_INSTALL_DIR" ]; then
   echo "$SOLR_INSTALL_DIR not found! Please check the SOLR_INSTALL_DIR setting in your $0 script."