diff --git a/README.md b/README.md index 9007bd3..4281fb0 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ Jira ==== -An Ansible role for install, configure and update [Jira](https://www.atlassian.com/ru/software/jira). +An Ansible role to install, configure and update [Jira](https://www.atlassian.com/ru/software/jira). Requirements ------------ diff --git a/meta/main.yml b/meta/main.yml index ffb618a..f3c82f7 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -2,7 +2,7 @@ galaxy_info: author: antmelekhin role_name: jira - description: An Ansible role for install, configure and update Jira. + description: An Ansible role to install, configure and update Jira. license: MIT diff --git a/molecule/default/requirements.yml b/molecule/default/requirements.yml deleted file mode 100644 index fd9c3d8..0000000 --- a/molecule/default/requirements.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -roles: - - src: geerlingguy.java diff --git a/tasks/install.yml b/tasks/install.yml index 466c722..cd73db4 100644 --- a/tasks/install.yml +++ b/tasks/install.yml @@ -4,13 +4,13 @@ cmd: grep -Po '(?<=^version=)\N*$' '{{ _jira_application_path }}/atlassian-jira/META-INF/maven/com.atlassian.jira/jira-webapp-dist/pom.properties' failed_when: false changed_when: false - register: _jira_version_check + register: __jira_version_check - name: 'Download and unarchive Jira' when: - not ansible_check_mode - - _jira_version_check.stdout is not defined or - jira_version not in _jira_version_check.stdout + - __jira_version_check.stdout is not defined or + jira_version not in __jira_version_check.stdout block: - name: 'Download Jira archive to local folder' ansible.builtin.get_url: diff --git a/tasks/main.yml b/tasks/main.yml index d39d98b..7c7820b 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,9 +1,9 @@ --- -- name: 'Include tasks for preparing to install Jira' +- name: 'Include tasks to prepare to install Jira' ansible.builtin.import_tasks: 'pre-install.yml' -- name: 'Include tasks for Installing Jira' +- name: 'Include tasks to install Jira' ansible.builtin.import_tasks: 'install.yml' -- name: 'Include tasks for Configure Jira' +- name: 'Include tasks to configure Jira' ansible.builtin.import_tasks: 'configure.yml' diff --git a/tasks/pre-install.yml b/tasks/pre-install.yml index 32406bb..6fde2de 100644 --- a/tasks/pre-install.yml +++ b/tasks/pre-install.yml @@ -1,5 +1,5 @@ --- -- name: 'Prepare for install Jira' +- name: 'Prepare to install Jira' become: true block: - name: 'Install fontconfig' @@ -17,7 +17,6 @@ group: '{{ jira_group }}' comment: 'Atlassian JIRA' shell: /bin/bash - register: _jira_user_result - name: 'Create Jira directories' ansible.builtin.file: diff --git a/templates/dbconfig.xml.j2 b/templates/dbconfig.xml.j2 index d725092..e13a1f9 100644 --- a/templates/dbconfig.xml.j2 +++ b/templates/dbconfig.xml.j2 @@ -1,7 +1,6 @@ {{ ansible_managed | comment('xml') }} - defaultDS default diff --git a/templates/jira.service.j2 b/templates/jira.service.j2 index 2157755..3b33585 100644 --- a/templates/jira.service.j2 +++ b/templates/jira.service.j2 @@ -1,5 +1,4 @@ {{ ansible_managed | comment }} - [Unit] Description=Jira {{ jira_product | upper }} After=network.target diff --git a/templates/server.xml.j2 b/templates/server.xml.j2 index cf9c8e6..9ee887d 100644 --- a/templates/server.xml.j2 +++ b/templates/server.xml.j2 @@ -17,7 +17,6 @@ --> {{ ansible_managed | comment('xml') }} -