From 4fddb6d322da05840f8360700119fb85222b3a95 Mon Sep 17 00:00:00 2001
From: Melekhin Anton <antmelekhin@gmail.com>
Date: Fri, 16 Aug 2024 20:58:40 +0400
Subject: [PATCH] fix!: rename `jira_root_path` variable

---
 README.md                 |  5 +++++
 defaults/main.yml         |  2 +-
 meta/argument_specs.yml   |  2 +-
 tasks/configure.yml       |  4 ++--
 tasks/install.yml         | 11 +++++------
 tasks/pre-install.yml     |  2 +-
 templates/jira.service.j2 |  6 +++---
 vars/main.yml             |  3 +--
 8 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 9106640..888eb54 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,11 @@ Jira
 
 An Ansible role to install, configure and update [Jira](https://www.atlassian.com/ru/software/jira).
 
+Upgrade to 2.x
+--------------
+
+In version 2.0.0, the `jira_root_path` variable was renamed to `jira_install_path`.
+
 Requirements
 ------------
 
diff --git a/defaults/main.yml b/defaults/main.yml
index 3a262e7..9abcc4b 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -11,7 +11,7 @@ jira_user: 'jira'
 jira_group: '{{ jira_user }}'
 
 # The Jira directories
-jira_root_path: '/opt/atlassian/jira'
+jira_install_path: '/opt/atlassian/jira'
 jira_home_path: '/var/atlassian/application-data/jira'
 
 # The Jira environment configuration
diff --git a/meta/argument_specs.yml b/meta/argument_specs.yml
index 951b71b..7fc7eb1 100644
--- a/meta/argument_specs.yml
+++ b/meta/argument_specs.yml
@@ -42,7 +42,7 @@ argument_specs:
         type: 'str'
         description: 'System group that will be created.'
         default: '{{ jira_user }}'
-      jira_root_path:
+      jira_install_path:
         type: 'path'
         description: 'The Jira installation directory.'
         default: '/opt/atlassian/jira'
diff --git a/tasks/configure.yml b/tasks/configure.yml
index 5ff0aef..147d62f 100644
--- a/tasks/configure.yml
+++ b/tasks/configure.yml
@@ -14,7 +14,7 @@
     - name: 'Configure the Jira server settings'
       ansible.builtin.template:
         src: 'server.xml.j2'
-        dest: '{{ _jira_application_path }}/conf/server.xml'
+        dest: '{{ __jira_root_path }}/conf/server.xml'
         owner: '{{ jira_user }}'
         group: '{{ jira_group }}'
         mode: 0644
@@ -23,7 +23,7 @@
     - name: 'Configure the Jira environment'
       ansible.builtin.template:
         src: 'setenv.sh.j2'
-        dest: '{{ _jira_application_path }}/bin/setenv.sh'
+        dest: '{{ __jira_root_path }}/bin/setenv.sh'
         owner: '{{ jira_user }}'
         group: '{{ jira_group }}'
         mode: 0755
diff --git a/tasks/install.yml b/tasks/install.yml
index 30db1c1..91b6ebf 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -1,7 +1,7 @@
 ---
 - name: 'Check the current Jira version'
   ansible.builtin.command:
-    cmd: grep -Po '(?<=^version=)\N*$' '{{ _jira_application_path }}/atlassian-jira/META-INF/maven/com.atlassian.jira/jira-webapp-dist/pom.properties'
+    cmd: grep -Po '(?<=^version=)\N*$' '{{ __jira_root_path }}/atlassian-jira/META-INF/maven/com.atlassian.jira/jira-webapp-dist/pom.properties'
   failed_when: false
   changed_when: false
   register: __jira_version_check
@@ -23,17 +23,16 @@
     - name: 'Unarchive Jira'
       ansible.builtin.unarchive:
         src: '{{ jira_download_path }}/{{ jira_archive_name }}'
-        dest: '{{ _jira_install_path }}'
+        dest: '{{ jira_install_path }}/{{ jira_version }}'
         owner: '{{ jira_user }}'
         group: '{{ jira_group }}'
-        extra_opts:
-          - '--strip-components=1'
+        extra_opts: ['--strip-components=1']
       become: true
 
 - name: 'Create the symbolic link to Jira installation path'
   ansible.builtin.file:
-    src: '{{ _jira_install_path }}'
-    dest: '{{ _jira_application_path }}'
+    src: '{{ jira_install_path }}/{{ jira_version }}'
+    dest: '{{ __jira_root_path }}'
     state: 'link'
   when: not ansible_check_mode
   become: true
diff --git a/tasks/pre-install.yml b/tasks/pre-install.yml
index 341f125..a48a934 100644
--- a/tasks/pre-install.yml
+++ b/tasks/pre-install.yml
@@ -34,7 +34,7 @@
         state: 'directory'
         mode: 0755
       loop:
-        - '{{ _jira_install_path }}'
+        - '{{ jira_install_path }}/{{ jira_version }}'
         - '{{ jira_home_path }}'
       loop_control:
         loop_var: jira_path
diff --git a/templates/jira.service.j2 b/templates/jira.service.j2
index b24c954..06392f7 100644
--- a/templates/jira.service.j2
+++ b/templates/jira.service.j2
@@ -7,9 +7,9 @@ After=network.target
 [Service]
 Type=forking
 User={{ jira_user }}
-PIDFile={{ _jira_application_path }}/work/catalina.pid
-ExecStart={{ _jira_application_path }}/bin/start-jira.sh
-ExecStop={{ _jira_application_path }}/bin/stop-jira.sh
+PIDFile={{ __jira_root_path }}/work/catalina.pid
+ExecStart={{ __jira_root_path }}/bin/start-jira.sh
+ExecStop={{ __jira_root_path }}/bin/stop-jira.sh
 
 [Install]
 WantedBy=multi-user.target
diff --git a/vars/main.yml b/vars/main.yml
index 0017c35..0003560 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,3 +1,2 @@
 ---
-_jira_install_path: '{{ jira_root_path }}/{{ jira_version }}'
-_jira_application_path: '{{ jira_root_path }}/current'
+__jira_root_path: '{{ jira_install_path }}/current'