[ansible] Fixes jfrog#331 Install doesn't work with non-default artif…

…actory_user and artifactory_group
Hiruma31 · Sep 14, 2023 · 7fd7481 · 7fd7481
1 parent 9c1f1fc
commit 7fd7481
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/shared/install_service.yml b/Ansible/ansible_collections/jfrog/platform/roles/artifactory/shared/install_service.yml
@@ -1,5 +1,5 @@
 ---
 - name: Create artifactory service
   become: true
-  ansible.builtin.command: "{{ artifactory_home }}/app/bin/installService.sh"
+  ansible.builtin.command: "{{ artifactory_home }}/app/bin/installService.sh {{ artifactory_user }} {{ artifactory_group }}"
   notify: Restart artifactory
diff --git a/Ansible/ansible_collections/jfrog/platform/roles/distribution/defaults/main.yml b/Ansible/ansible_collections/jfrog/platform/roles/distribution/defaults/main.yml
@@ -24,7 +24,7 @@ distribution_home: "{{ jfrog_home_directory }}/distribution"
 
 distribution_install_script_path: "{{ distribution_home }}/app/bin"
 distribution_thirdparty_path: "{{ distribution_home }}/app/third-party"
-distribution_archive_service_cmd: "{{ distribution_install_script_path }}/installService.sh"
+distribution_archive_service_cmd: "{{ distribution_install_script_path }}/installService.sh --user {{ distribution_user }} --group {{ distribution_group }}"
 distribution_service_file: /lib/systemd/system/distribution.service
 
 # distribution users and groups

diff --git a/Ansible/ansible_collections/jfrog/platform/roles/insight/defaults/main.yml b/Ansible/ansible_collections/jfrog/platform/roles/insight/defaults/main.yml
@@ -24,7 +24,7 @@ insight_home: "{{ jfrog_home_directory }}/insight"
 
 insight_install_script_path: "{{ insight_home }}/app/bin"
 insight_thirdparty_path: "{{ insight_home }}/app/third-party"
-insight_archive_service_cmd: "{{ insight_install_script_path }}/installService.sh"
+insight_archive_service_cmd: "{{ insight_install_script_path }}/installService.sh --user {{ insight_user }} --group {{ insight_group }}"
 insight_service_file: /lib/systemd/system/insight.service
 
 # Insight users and groups

diff --git a/Ansible/ansible_collections/jfrog/platform/roles/xray/defaults/main.yml b/Ansible/ansible_collections/jfrog/platform/roles/xray/defaults/main.yml
@@ -24,7 +24,7 @@ xray_home: "{{ jfrog_home_directory }}/xray"
 
 xray_install_script_path: "{{ xray_home }}/app/bin"
 xray_thirdparty_path: "{{ xray_home }}/app/third-party"
-xray_archive_service_cmd: "{{ xray_install_script_path }}/installService.sh"
+xray_archive_service_cmd: "{{ xray_install_script_path }}/installService.sh --user {{ xray_user }} --group {{ xray_group }}"
 xray_service_file: /lib/systemd/system/xray.service
 
 # Xray users and groups