From 6aeaab078dbca907af509e7ea96ac739ff9d8614 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Tue, 27 Sep 2022 07:47:26 +0200
Subject: [PATCH] lxc-solr: set homedir and port at install

---
 CHANGELOG.md            |  1 +
 lxc-solr/tasks/main.yml |  6 +++++-
 lxc-solr/tasks/solr.yml | 30 ++++++++----------------------
 3 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 09044345..289ec68c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ The **patch** part changes is incremented if multiple releases happen the same m
 
 * lxc-solr: choose java package and download URL according to Solr Version
 * lxc-solr: detect the real partition options
+* lxc-solr: set homedir and port at install
 
 ### Fixed
 
diff --git a/lxc-solr/tasks/main.yml b/lxc-solr/tasks/main.yml
index d629bbf6..bc279a04 100644
--- a/lxc-solr/tasks/main.yml
+++ b/lxc-solr/tasks/main.yml
@@ -10,5 +10,9 @@
     mode: '0755'
   loop: "{{ lxc_containers }}"
 
-- include: "solr.yml name={{item.name}} solr_version={{item.solr_version}} solr_port={{item.solr_port}}"
+- include: solr.yml
+  args:
+    name: "{{ item.name }}"
+    solr_version: "{{ item.solr_version }}"
+    solr_port: "{{ item.solr_port }}"
   loop: "{{ lxc_containers }}"
diff --git a/lxc-solr/tasks/solr.yml b/lxc-solr/tasks/solr.yml
index 3a4baa1f..8ded722e 100644
--- a/lxc-solr/tasks/solr.yml
+++ b/lxc-solr/tasks/solr.yml
@@ -5,6 +5,8 @@
     java_package: openjdk-8-jre-headless
     tarball_url: https://archive.apache.org/dist/lucene/solr/{{ solr_version }}/solr-{{ solr_version }}.tgz
     tarball_path: /var/lib/lxc/{{ name }}/rootfs/root/solr-{{ solr_version }}.tgz
+    start_command: "/etc/init.d/solr start"
+    stop_command: "/etc/init.d/solr stop"
   when: "solr_version is version('9.0.0', '<')"
 
 - name: "Set values for Solr >= 9.0.0"
@@ -12,6 +14,8 @@
     java_package: openjdk-11-jre-headless
     tarball_url: https://archive.apache.org/dist/solr/solr/{{ solr_version }}/solr-{{ solr_version }}.tgz
     tarball_path: /var/lib/lxc/{{ name }}/rootfs/root/solr-{{ solr_version }}.tgz
+    start_command: "systemctl start solr"
+    stop_command: "systemctl stop solr"
   when: "solr_version is version('9.0.0', '>=')"
 
 - name: Install java and lsof packages
@@ -29,30 +33,12 @@
     dest: /var/lib/lxc/{{ name }}/rootfs/root/
     remote_src: yes
 
-- name: "Install Solr {{ solr_version }}"
-  command: "lxc-attach -n {{name}} -- /root/solr-{{ solr_version }}/bin/install_solr_service.sh /root/solr-{{ solr_version }}.tgz"
-
-- name: "Stop Solr"
-  command: "lxc-attach -n {{name}} -- /etc/init.d/solr stop"
-  ignore_errors: True
-
 - name: "Make sure /home/solr exists"
   file:
-    path: /home/solr
+    path: /home/solr/{{ name }}
+    recurse: yes
     state: directory
     mode: '0755'
 
-- name: "Move Solr data directory to /home/solr/{{name}}"
-  command: "lxc-attach -n {{name}} -- mv /var/solr /home/solr/{{name}}"
-
-- name: "Create a symbolic link to /home/solr/{{name}}"
-  command: "lxc-attach -n {{name}} -- ln -s /home/solr/{{name}} /var/solr"
-
-- name: "Set Solr port to {{ solr_port }}"
-  lineinfile:
-    dest: /var/lib/lxc/{{ name }}/rootfs/etc/default/solr.in.sh
-    line: "SOLR_PORT=\"{{ solr_port }}\""
-    regexp: "^SOLR_PORT="
-
-- name: "Start Solr"
-  command: "lxc-attach -n {{name}} -- /etc/init.d/solr start"
+- name: "Install Solr {{ solr_version }}"
+  command: "lxc-attach -n {{name}} -- /root/solr-{{ solr_version }}/bin/install_solr_service.sh /root/solr-{{ solr_version }}.tgz -d /home/solr/{{name}} -p {{ solr_port }}"