From a90f59fc78bf4357e66424f6a5d0d3594d17f317 Mon Sep 17 00:00:00 2001
From: Victor LABORIE <vlaborie@evolix.fr>
Date: Fri, 21 Apr 2017 15:14:56 +0200
Subject: [PATCH] tomcat-instance: fix right of copied tomcat conf

---
 tomcat-instance/tasks/bootstrap.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tomcat-instance/tasks/bootstrap.yml b/tomcat-instance/tasks/bootstrap.yml
index 52c1b1ee..367cc869 100644
--- a/tomcat-instance/tasks/bootstrap.yml
+++ b/tomcat-instance/tasks/bootstrap.yml
@@ -14,6 +14,11 @@
     - 'temp'
     - 'lib'
 
+- name: Copy conf dir
+  shell: "cd {{ tomcat_instance_root }}/{{ tomcat_instance_name }}/conf/ && cp /usr/share/tomcat7/skel/conf/* . && chmod 660 * && chown {{ tomcat_instance_name }}: *"
+  args:
+    creates: "{{ tomcat_instance_root }}/{{ tomcat_instance_name }}/conf/catalina.properties"
+
 - name: Copy server.xml
   template:
     src: 'templates/server.xml.j2'
@@ -23,11 +28,6 @@
     group: "{{ tomcat_instance_name }}"
     force: no
 
-- name: Copy conf dir
-  shell: "cp /usr/share/tomcat7/skel/conf/* {{ tomcat_instance_root }}/{{ tomcat_instance_name }}/conf/"
-  args:
-    creates: "{{ tomcat_instance_root }}/{{ tomcat_instance_name }}/conf/catalina.properties"
-
 - name: Copy env file
   template:
     src: 'templates/env.j2'