fix: move db configuration task from db.yml to configure.yml

antmelekhin · Jun 20, 2023 · 1b18d34 · 1b18d34
1 parent 373858c
commit 1b18d34
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/tasks/configure.yml b/tasks/configure.yml
@@ -29,6 +29,16 @@
         mode: 0755
       notify: Restart Jira
 
+    - name: 'Configure Jira database connection'
+      ansible.builtin.template:
+        src: 'dbconfig.xml.j2'
+        dest: '{{ jira_home_path }}/dbconfig.xml'
+        owner: '{{ jira_username }}'
+        group: '{{ jira_group }}'
+        mode: 0600
+      notify: Restart Jira
+      when: jira_db_configuration | bool
+
     - name: 'Ensure Jira is running and enabled at boot'
       ansible.builtin.systemd:
         name: jira

diff --git a/tasks/db.yml b/tasks/db.yml
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -7,7 +7,3 @@
 
 - name: 'Include tasks for Configure Jira'
   ansible.builtin.import_tasks: 'configure.yml'
-
-- name: 'Include tasks for connecting Jira to database'
-  ansible.builtin.import_tasks: 'db.yml'
-  when: jira_db_configuration | bool