Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

style: rename some task names and minor changes #10

Merged
merged 6 commits into from
Feb 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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
------------
Expand Down
2 changes: 1 addition & 1 deletion meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 0 additions & 3 deletions molecule/default/requirements.yml

This file was deleted.

6 changes: 3 additions & 3 deletions tasks/install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions tasks/main.yml
Original file line number Diff line number Diff line change
@@ -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'
3 changes: 1 addition & 2 deletions tasks/pre-install.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
- name: 'Prepare for install Jira'
- name: 'Prepare to install Jira'
become: true
block:
- name: 'Install fontconfig'
Expand All @@ -17,7 +17,6 @@
group: '{{ jira_group }}'
comment: 'Atlassian JIRA'
shell: /bin/bash
register: _jira_user_result

- name: 'Create Jira directories'
ansible.builtin.file:
Expand Down
1 change: 0 additions & 1 deletion templates/dbconfig.xml.j2
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

{{ ansible_managed | comment('xml') }}

<jira-database-config>
<name>defaultDS</name>
<delegator-name>default</delegator-name>
Expand Down
1 change: 0 additions & 1 deletion templates/jira.service.j2
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{{ ansible_managed | comment }}

[Unit]
Description=Jira {{ jira_product | upper }}
After=network.target
Expand Down
1 change: 0 additions & 1 deletion templates/server.xml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
-->

{{ ansible_managed | comment('xml') }}

<Server port="8005" shutdown="SHUTDOWN">
<Listener className="org.apache.catalina.startup.VersionLoggerListener"/>
<Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on"/>
Expand Down
Loading