From 4b1d12f1bf9752df2cca8c277afbf811c69f4145 Mon Sep 17 00:00:00 2001
From: Steve Smith <ssmith@atlassian.com>
Date: Fri, 24 May 2019 09:48:44 +1000
Subject: [PATCH] DCD-360: Move environment settings to setenv.sh for
 consitency.

---
 roles/jira_config/molecule/default/playbook.yml      |  1 +
 .../molecule/default/tests/test_default.py           |  7 +++++--
 roles/jira_config/tasks/main.yml                     | 12 ++++++++++++
 roles/jira_startup/templates/jira.service.j2         |  4 ----
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/roles/jira_config/molecule/default/playbook.yml b/roles/jira_config/molecule/default/playbook.yml
index 3ccb136..51783ff 100644
--- a/roles/jira_config/molecule/default/playbook.yml
+++ b/roles/jira_config/molecule/default/playbook.yml
@@ -9,6 +9,7 @@
     atl_jdbc_user: 'atljira'
     atl_jvm_heap: 'PLACEHOLDER'
     atl_cluster_node_id: 'FAKEID'
+
   roles:
     - role: linux_common
     - role: product_common
diff --git a/roles/jira_config/molecule/default/tests/test_default.py b/roles/jira_config/molecule/default/tests/test_default.py
index a5ab004..2be5dfb 100644
--- a/roles/jira_config/molecule/default/tests/test_default.py
+++ b/roles/jira_config/molecule/default/tests/test_default.py
@@ -17,8 +17,11 @@ def test_dbconfig_file(host):
 def test_setenv_file(host):
     f = host.file('/opt/atlassian/jira-software/current/bin/setenv.sh')
     assert f.exists
-    assert f.contains('JVM_MINIMUM_MEMORY="PLACEHOLDER"')
-    assert f.contains('JVM_MAXIMUM_MEMORY="PLACEHOLDER"')
+    assert f.contains('^JVM_MINIMUM_MEMORY="PLACEHOLDER"')
+    assert f.contains('^JVM_MAXIMUM_MEMORY="PLACEHOLDER"')
+    assert f.contains('^JIRA_HOME="/var/atlassian/application-data/jira"')
+    assert f.contains('^export CATALINA_OPTS="')
+
 
 def test_cluster_file(host):
     f = host.file('/var/atlassian/application-data/jira/cluster.properties')
diff --git a/roles/jira_config/tasks/main.yml b/roles/jira_config/tasks/main.yml
index 5cba423..8367501 100644
--- a/roles/jira_config/tasks/main.yml
+++ b/roles/jira_config/tasks/main.yml
@@ -29,6 +29,18 @@
     - 'JVM_MINIMUM_MEMORY'
     - 'JVM_MAXIMUM_MEMORY'
 
+- name: Set Jira home directory
+  lineinfile:
+    path: "{{ atl_product_installation_versioned }}/bin/setenv.sh"
+    regexp: "JIRA_HOME="
+    line: 'JIRA_HOME="{{ atl_product_home }}"'
+
+- name: Set the Tomcat environment
+  lineinfile:
+    path: "{{ atl_product_installation_versioned }}/bin/setenv.sh"
+    insertafter: "EOF"
+    line: 'export CATALINA_OPTS="${CATALINA_OPTS} {{ atl_catalina_opts }} {{ atl_catalina_opts_extra }}"'
+
 - name: Create application directories
   file:
     path: "{{ item }}"
diff --git a/roles/jira_startup/templates/jira.service.j2 b/roles/jira_startup/templates/jira.service.j2
index 62f513c..cccd046 100644
--- a/roles/jira_startup/templates/jira.service.j2
+++ b/roles/jira_startup/templates/jira.service.j2
@@ -6,10 +6,6 @@ After=network-online.target
 User={{ atl_product_user }}
 Group={{ atl_product_user }}
 
-# NOTE: Additional environment vars are set in {{ atl_product_installation_current }}/bin/setenv.sh
-Environment="JIRA_HOME={{ atl_product_home }}"
-Environment="CATALINA_OPTS={{ atl_catalina_opts }} {{ atl_catalina_opts_extra }}"
-
 ExecStart={{ atl_product_installation_current }}/bin/start-jira.sh -fg
 Restart=on-failure