From 5c72aab0095be169222b18825a8ee27d91441656 Mon Sep 17 00:00:00 2001
From: Guido Grazioli <ggraziol@redhat.com>
Date: Fri, 31 Dec 2021 11:22:19 +0100
Subject: [PATCH] fix posix user owning download directory

---
 roles/infinispan/defaults/main.yml           |  4 ++--
 roles/infinispan/tasks/download_from_rhn.yml |  6 ++++++
 roles/infinispan/tasks/install.yml           | 18 ++++++++++++++++--
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/roles/infinispan/defaults/main.yml b/roles/infinispan/defaults/main.yml
index b69f18a..860130f 100644
--- a/roles/infinispan/defaults/main.yml
+++ b/roles/infinispan/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
 # Red Hat JDG specific config
 jdg_version: "8.2.0"
-jdg_default_installation_path: "/opt/redhat-datagrid-{{ jdg_version }}-server/"
+jdg_default_installation_path: "/opt/infinispan/redhat-datagrid-{{ jdg_version }}-server/"
 jdg_bundle: "jdg-{{ jdg_version }}.zip"
 jdg_download_url: 'https://access.redhat.com/jbossnetwork/restricted/softwareDownload.html?softwareId='
 
@@ -9,7 +9,7 @@ jdg_download_url: 'https://access.redhat.com/jbossnetwork/restricted/softwareDow
 infinispan_version: "12.1.7.Final"
 infinispan_bundle: "infinispan-server-{{ infinispan_version }}.zip"
 infinispan_download_url: "https://downloads.jboss.org/infinispan/{{ infinispan_version }}/{{ infinispan_bundle }}"
-infinispan_installation_path: "/opt/infinispan-server-{{ infinispan_version }}/"
+infinispan_installation_path: "/opt/infinispan/infinispan-server-{{ infinispan_version }}/"
 
 # common config for datagrid/infinispan service
 jdg_app_download_dir: "/opt/apps"
diff --git a/roles/infinispan/tasks/download_from_rhn.yml b/roles/infinispan/tasks/download_from_rhn.yml
index 92dedec..660d786 100644
--- a/roles/infinispan/tasks/download_from_rhn.yml
+++ b/roles/infinispan/tasks/download_from_rhn.yml
@@ -28,6 +28,11 @@
   register: path_to_downloaded_artefact
 
 - block:
+    - name: "Check work directory: {{ work_dir }}"
+      stat:
+        path: "{{ work_dir }}"
+      register: path_to_workdir
+
     - name: "Create work directory {{ work_dir }}"
       file:
         path: "{{ work_dir }}"
@@ -35,6 +40,7 @@
         owner: "{{ jdg.user.name }}"
         group: "{{ jdg.group.name }}"
         mode: 0750
+      when: not path_to_workdir.stat.exists
 
     - name: "Check target directory: {{ target_dir }}"
       stat:
diff --git a/roles/infinispan/tasks/install.yml b/roles/infinispan/tasks/install.yml
index 021eba1..d2fdfd4 100644
--- a/roles/infinispan/tasks/install.yml
+++ b/roles/infinispan/tasks/install.yml
@@ -17,11 +17,25 @@
         - archive_path.stat is defined
         - not archive_path.stat.exists
 
+    - name: "Check work directory: /opt/infinispan"
+      stat:
+        path: "/opt/infinispan"
+      register: path_to_workdir
+
+    - name: "Create work directory /opt/infinispan"
+      file:
+        path: "/opt/infinispan"
+        state: directory
+        owner: "{{ jdg.user.name }}"
+        group: "{{ jdg.group.name }}"
+        mode: 0750
+      when: not path_to_workdir.stat.exists
+
     - name: Extract infinispan archive on target
       unarchive:
         remote_src: yes
         src: "{{ archive }}"
-        dest: "/opt"
+        dest: "/opt/infinispan"
         creates: "{{ infinispan_installation_path }}"
         owner: "{{ jdg.user.name }}"
         group: "{{ jdg.group.name }}"
@@ -48,7 +62,7 @@
       vars:
         rhn_id_file: "{{ jdg_rhn_id }}"
         zipfile_dest: "{{ archive }}"
-        work_dir: "/opt"
+        work_dir: "/opt/infinispan"
         target_dir: "{{ jdg_default_installation_path }}"
   become: yes
   when: jdg_enable