From ce864ebd8c48319bd867dc1a2598ae67824fced0 Mon Sep 17 00:00:00 2001
From: Steve Smith <ssmith@atlassian.com>
Date: Wed, 17 Apr 2019 14:30:31 +1000
Subject: [PATCH] DCD-224: Add required environment to Jira service file.

---
 group_vars/all.yml                           | 9 +++++++++
 roles/jira_startup/templates/jira.service.j2 | 2 ++
 2 files changed, 11 insertions(+)

diff --git a/group_vars/all.yml b/group_vars/all.yml
index 34de359..2468ec0 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -47,3 +47,12 @@ atl_jdbc_url: "jdbc:postgresql://{{ atl_db_host }}:{{ atl_db_port }}/{{ atl_jdbc
 
 atl_jvm_heap: "{{ lookup('env', 'ATL_JVM_HEAP) or '2048m' }}"
 atl_catalina_opts: "{{ lookup('env', 'ATL_CATALINA_OPTS) or '' }}"
+atl_catalina_opts_extra: >-
+  -XX:+UseG1GC
+  -XX:+PrintAdaptiveSizePolicy
+  -XX:+PrintGCDetails
+  -XX:NumberOfGCLogFiles=10
+  -XX:GCLogFileSize=5m
+  -XX:+UseGCLogFileRotation
+  -XX:+PrintTenuringDistribution
+  -Dfile.encoding=UTF-8
diff --git a/roles/jira_startup/templates/jira.service.j2 b/roles/jira_startup/templates/jira.service.j2
index c828c90..728afa1 100644
--- a/roles/jira_startup/templates/jira.service.j2
+++ b/roles/jira_startup/templates/jira.service.j2
@@ -6,6 +6,8 @@ After=network-online.target
 User={{ atl_product_user }}
 Group={{ atl_product_user }}
 
+Environment=JIRA_HOME="{{ atl_product_home }}"
+Environment=CATALINA_OPTS="{{ atl_catalina_opts }} {{ atl_catalina_opts }}"
 ExecStart={{ atl_product_installation_target }}/bin/start-jira.sh -fg
 
 [Install]