[jfrog-platform] 7.25.7 release (#159)

Ansible/ansible_collections/jfrog/platform/roles/distribution/defaults/main.yml

@@ -1,7 +1,7 @@
 # defaults file for distribution
 
 # The version of distribution to install
-distribution_version: 2.9.0
+distribution_version: 2.9.2
 
 # whether to enable HA
 distribution_ha_enabled: false

Ansible/ansible_collections/jfrog/platform/roles/distribution/handlers/main.yml

@@ -5,3 +5,9 @@
   systemd:
     name: "{{ distribution_daemon }}"
     state: restarted
+
+- name: stop distribution
+  become: yes
+  systemd:
+    name: "{{ distribution_daemon }}"
+    state: stopped

Ansible/ansible_collections/jfrog/platform/roles/distribution/meta/main.yml

@@ -1,16 +1,27 @@
+---
+dependencies: []
+
 galaxy_info:
   author: "JFrog Maintainers Team <installers@jfrog.com>"
   description: "The distribution role will install distribution software onto the host. An Artifactory server and Postgress database is required."
   company: JFrog
-
   issue_tracker_url: "https://github.com/jfrog/JFrog-Cloud-Installers/issues"
-
   license: license (Apache-2.0)
-
   min_ansible_version: 2.9
-
+  platforms:
+    - name: EL
+      versions:
+        - 7
+        - 8
+    - name: Ubuntu
+      versions:
+        - xenial
+        - bionic
+        - focal
+    - name: Debian
+      versions:
+        - stretch
+        - buster
   galaxy_tags:
     - distribution
-    - jfrog
-
-dependencies: []
+    - jfrog

Ansible/ansible_collections/jfrog/platform/roles/distribution/tasks/expect.yml

@@ -42,3 +42,4 @@
     executable: /usr/bin/expect
     chdir: "{{ exp_dir }}"
   register: exp_result
+  changed_when: false

Ansible/ansible_collections/jfrog/platform/roles/distribution/tasks/install.yml

@@ -1,6 +1,3 @@
-- debug:
-    msg: "Performing installation of Distribution version - {{ distribution_version }}"
-
 - name: Install prerequisite packages
   include_tasks: "{{ ansible_os_family }}.yml"
 
@@ -56,7 +53,10 @@
 
 - name: Copy untar directory to distribution home
   become: yes
-  command: "cp -r {{ distribution_untar_home }}/. {{ distribution_home }}"
+  copy:
+    src: "{{ distribution_untar_home }}/"
+    dest: "{{ distribution_home }}"
+    remote_src: yes
   when: not app_dir_check.stat.exists
 
 - name: Create required directories
@@ -108,6 +108,7 @@
   template:
     src: "redis.conf.j2"
     dest: "{{ distribution_home }}/var/etc/redis/redis.conf"
+    mode: 0644
   notify: restart distribution
 
 - name: Check if systemyaml exists
@@ -121,6 +122,7 @@
   template:
     src: "{{ distribution_system_yaml_template }}"
     dest: "{{ distribution_home }}/var/etc/system.yaml"
+    mode: 0644
   when:
     - distribution_systemyaml is defined
     - distribution_systemyaml|length > 0
@@ -132,6 +134,7 @@
   template:
     src: installer-info.json.j2
     dest: "{{ distribution_home }}/var/etc/info/installer-info.json"
+    mode: 0644
   notify: restart distribution
 
 - name: Update distribution permissions
@@ -145,21 +148,12 @@
 
 - name: Install Distribution as a service
   become: yes
-  shell: "{{ distribution_archive_service_cmd }}"
+  command: "{{ distribution_archive_service_cmd }}"
   args:
     chdir: "{{ distribution_install_script_path }}"
     creates: "{{ distribution_service_file }}"
   register: check_service_status_result
 
-- name: Update distribution permissions
-  become: yes
-  file:
-    path: "{{ distribution_home }}"
-    state: directory
-    recurse: yes
-    owner: "{{ distribution_user }}"
-    group: "{{ distribution_group }}"
-
 - name: Restart distribution
   meta: flush_handlers
 

Ansible/ansible_collections/jfrog/platform/roles/distribution/tasks/upgrade.yml

@@ -1,6 +1,3 @@
-- debug:
-    msg: "Performing upgrade of Distribution version to {{ distribution_version }} "
-
 - name: Check if distribution tar already exists
   become: yes
   stat:
@@ -29,12 +26,8 @@
     creates: "{{ distribution_untar_home }}"
   when: download_distribution is succeeded
 
-- name: Stop distribution
-  become: yes
-  systemd:
-    name: "{{ distribution_daemon }}"
-    state: stopped
-  when: download_distribution.changed
+- name: stop distribution
+  meta: flush_handlers
 
 - name: Delete distribution app
   become: yes
@@ -48,21 +41,22 @@
   command: "cp -r {{ distribution_untar_home }}/app/. {{ distribution_home }}/app"
   when: download_distribution.changed
 
-- name: Check if systemyaml exists
+- name: Check if system.yaml exists
   become: yes
   stat:
     path: "{{ distribution_home }}/var/etc/system.yaml"
   register: systemyaml
 
-- name: Configure systemyaml
+- name: Configure system.yaml
   become: yes
   template:
     src: "{{ distribution_system_yaml_template }}"
     dest: "{{ distribution_home }}/var/etc/system.yaml"
+    mode: 0644
   when:
     - distribution_systemyaml is defined
     - distribution_systemyaml|length > 0
-    - distribution_systemyaml_override or (not systemyaml.stat.exists) 
+    - distribution_systemyaml_override or (not systemyaml.stat.exists)
   notify: restart distribution
 
 - name: Check if install.sh wrapper script exist
@@ -89,19 +83,21 @@
     - install_wrapper_script.stat.exists
     - download_distribution.changed
 
-- name: Ensure {{ distribution_home }}/var/etc/redis exists
+- name: Ensure redis config directory exists
   become: yes
   file:
     path: "{{ distribution_home }}/var/etc/redis/"
     state: directory
     owner: "{{ distribution_user }}"
     group: "{{ distribution_group }}"
+    mode: 0644
 
 - name: Configure redis config
   become: yes
   template:
     src: "redis.conf.j2"
     dest: "{{ distribution_home }}/var/etc/redis/redis.conf"
+    mode: 0644
   notify: restart distribution
 
 - name: Configure installer info
@@ -109,6 +105,7 @@
   template:
     src: installer-info.json.j2
     dest: "{{ distribution_home }}/var/etc/info/installer-info.json"
+    mode: 0644
   notify: restart distribution
 
 - name: Update distribution permissions

Ansible/ansible_collections/jfrog/platform/roles/distribution/vars/main.yml

@@ -1,5 +1,5 @@
 # platform collection version
-platform_collection_version: 7.24.3
+platform_collection_version: 7.25.7
 
 # indicates were this collection was downlaoded from (galaxy, automation_hub, standalone)
 ansible_marketplace: galaxy