From 5b05ef182e15884aa849655b3aeb19a765a27227 Mon Sep 17 00:00:00 2001
From: Serienmorder <pyro985@gmail.com>
Date: Thu, 17 Sep 2020 15:04:00 -0700
Subject: [PATCH] Prepping changes for better install

---
 .../roles/artifactory/tasks/install.yml       | 26 +++++++++++-
 .../artifactory/tasks/legacy_migration.yml    | 34 +++++++++++++++
 .../roles/artifactory/tasks/main.yml          | 41 ++++++++++++++++---
 Openshift4/helm/openshift-xray/LICENSE        |  0
 .../helm-charts/openshift-xray/README.md      |  0
 5 files changed, 93 insertions(+), 8 deletions(-)
 create mode 100644 Ansible/ansible_collections/jfrog/installers/roles/artifactory/tasks/legacy_migration.yml
 mode change 100755 => 100644 Openshift4/helm/openshift-xray/LICENSE
 mode change 100755 => 100644 Openshift4/operator/xray-operator/helm-charts/openshift-xray/README.md

diff --git a/Ansible/ansible_collections/jfrog/installers/roles/artifactory/tasks/install.yml b/Ansible/ansible_collections/jfrog/installers/roles/artifactory/tasks/install.yml
index a0e98ff..ccf9150 100644
--- a/Ansible/ansible_collections/jfrog/installers/roles/artifactory/tasks/install.yml
+++ b/Ansible/ansible_collections/jfrog/installers/roles/artifactory/tasks/install.yml
@@ -52,8 +52,30 @@
   until: downloadartifactory is succeeded
   retries: 3
 
-- name: MV untar directory to artifactory home
-  command: "mv {{ artifactory_untar_home }} {{ artifactory_home }}"
+- name: Create artifactory home folder
+  file:
+    state: directory
+    path: "{{ artifactory_home }}"
+    owner: "{{ artifactory_user }}"
+    group: "{{ artifactory_group }}"
+  become: yes
+
+- name: Create Symlinks for var folder
+  file:
+    state: link
+    src: "{{ artifactory_untar_home }}/var"
+    dest: "{{ artifactory_home }}/var"
+    owner: "{{ artifactory_user }}"
+    group: "{{ artifactory_group }}"
+  become: yes
+
+- name: Create Symlinks for app folder
+  file:
+    state: link
+    src: "{{ artifactory_untar_home }}/app"
+    dest: "{{ artifactory_home }}/app"
+    owner: "{{ artifactory_user }}"
+    group: "{{ artifactory_group }}"
   become: yes
 
 - name: ensure artifactory_file_store_dir exists
diff --git a/Ansible/ansible_collections/jfrog/installers/roles/artifactory/tasks/legacy_migration.yml b/Ansible/ansible_collections/jfrog/installers/roles/artifactory/tasks/legacy_migration.yml
new file mode 100644
index 0000000..e3e15d5
--- /dev/null
+++ b/Ansible/ansible_collections/jfrog/installers/roles/artifactory/tasks/legacy_migration.yml
@@ -0,0 +1,34 @@
+---
+- name: MV artifactory home to artifactory untar home
+  command: "mv {{ artifactory_home }} {{ temp_untar_home }}"
+  become: yes
+- name: Ensure untar home permissions are correct
+  file:
+    state: directory
+    path: "{{ temp_untar_home }}"
+    owner: "{{ artifactory_user }}"
+    group: "{{ artifactory_group }}"
+  become: yes
+- name: Create artifactory home folder
+  file:
+    state: directory
+    path: "{{ artifactory_home }}"
+    owner: "{{ artifactory_user }}"
+    group: "{{ artifactory_group }}"
+  become: yes
+- name: Create Symlinks for var folder
+  file:
+    state: link
+    src: "{{ temp_untar_home }}/var"
+    dest: "{{ artifactory_home }}/var"
+    owner: "{{ artifactory_user }}"
+    group: "{{ artifactory_group }}"
+  become: yes
+- name: Create Symlinks for app folder
+  file:
+    state: link
+    src: "{{ temp_untar_home }}/app"
+    dest: "{{ artifactory_home }}/app"
+    owner: "{{ artifactory_user }}"
+    group: "{{ artifactory_group }}"
+  become: yes
diff --git a/Ansible/ansible_collections/jfrog/installers/roles/artifactory/tasks/main.yml b/Ansible/ansible_collections/jfrog/installers/roles/artifactory/tasks/main.yml
index 3afccb3..fe837eb 100644
--- a/Ansible/ansible_collections/jfrog/installers/roles/artifactory/tasks/main.yml
+++ b/Ansible/ansible_collections/jfrog/installers/roles/artifactory/tasks/main.yml
@@ -1,6 +1,35 @@
-- name: perform installation
-  include_tasks: "install.yml"
-  when: not artifactory_upgrade_only
-- name: perform upgrade
-  include_tasks: "upgrade.yml"
-  when: artifactory_upgrade_only
\ No newline at end of file
+- name: Rectify Legacy Installation Block
+  block:
+    - name: Check symlink method
+      stat:
+        path: /opt/jfrog/artifactory/app
+      register: newMethod
+    - name: Check artifactory version
+      uri: 
+        url: "{{ web_method }}://{{ artifactory_server_url }}:{{ url_port }}/artifactory/api/system/version"
+        url_username: "{{ artifactory_app_username }}"
+        url_password: "{{ artifactory_app_user_pass }}"
+      register: artifactory_installed_version
+    - name: Debug defunct installation
+      debug:
+        var: artifactory_installed_version
+    - name: Setup temporary untar home
+      set_fact: 
+        temp_untar_home: "{{ jfrog_home_directory }}/artifactory-{{ artifactory_flavour }}-{{ artifactory_installed_version }}"
+    - name: Rectify legacy installation
+      include_tasks: "legacy_migration.yml"
+      when: (not newMethod.stat.islnk) and newMethod.stat.exists
+  rescue:
+    - name: Setup temporary untar home (assuming version is set var for version)
+      set_fact: 
+        temp_untar_home: "{{ jfrog_home_directory }}/artifactory-{{ artifactory_flavour }}-{{ artifactory_version }}"
+    - name: Rectify legacy installation
+      include_tasks: "legacy_migration.yml"
+      when: (not newMethod.stat.islnk) and newMethod.stat.exists
+  always:
+    - name: perform installation
+      include_tasks: "install.yml"
+      when: not artifactory_upgrade_only
+    - name: perform upgrade
+      include_tasks: "upgrade.yml"
+      when: artifactory_upgrade_only
\ No newline at end of file
diff --git a/Openshift4/helm/openshift-xray/LICENSE b/Openshift4/helm/openshift-xray/LICENSE
old mode 100755
new mode 100644
diff --git a/Openshift4/operator/xray-operator/helm-charts/openshift-xray/README.md b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/README.md
old mode 100755
new mode 100644