From 9299af1f73af0923c29e2c10f4adb420adb50c32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nathan=20V=C4=93rzemnieks?= <njvrzm@gmail.com>
Date: Tue, 19 May 2020 10:07:29 -0700
Subject: [PATCH] Log directory, permissions, and switch to catalina.sh (#3)

* Create log directory
* Correct some permissions
* Use CATALINA_OPTS instead of JAVA_OPTS for tomcat
---
 tasks/enable.yml  |  4 ++--
 tasks/install.yml | 14 ++++++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/tasks/enable.yml b/tasks/enable.yml
index 1bf329b..ed03961 100644
--- a/tasks/enable.yml
+++ b/tasks/enable.yml
@@ -2,9 +2,9 @@
 - name: Tomcat -javaagent setup
   lineinfile:
     dest: "{{ jvm_conf_file }}"
-    line: export JAVA_OPTS="$JAVA_OPTS -javaagent:{{ server_root }}/newrelic/newrelic.jar"
+    line: export CATALINA_OPTS="$CATALINA_OPTS -javaagent:{{ server_root }}/newrelic/newrelic.jar"
     create: yes # the file often doesn't exist with Tomcat
-    mode: 0755
+    mode: "0755"
   when: server_type == "tomcat"
   become: yes
   notify:
diff --git a/tasks/install.yml b/tasks/install.yml
index 97e21ff..839d6cd 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -7,6 +7,17 @@
     group: "{{ server_group }}"
   become: yes
 
+- name: Create the agent's log directory
+  file:
+    path: "{{ nr_java_agent_config.log_file_path }}"
+    state: directory
+    owner: "{{ server_user }}"
+    group: "{{ server_group }}"
+    mode: "0750"
+  when: nr_java_agent_config.log_file_path is defined
+
+  become: yes
+
 - name: Copy provided Java agent config file into place
   copy:
     src: "{{ nr_java_agent_config_file }}"
@@ -37,7 +48,6 @@
     src: "{{ nr_java_agent_zip_location }}"
     remote_src: "{{ nr_java_agent_zip_is_remote }}"
     dest: "{{ server_root }}"
-    mode: "0755"
     list_files: yes
     owner: "{{ server_user }}"
     group: "{{ server_group }}"
@@ -50,7 +60,7 @@
     src: "{{ server_root }}/newrelic/newrelic.yml.new"
     dest: "{{ server_root }}/newrelic/newrelic.yml"
     remote_src: true
-    mode: "0755"
+    mode: "0640"
     owner: "{{ server_user }}"
     group: "{{ server_group }}"
   become: true