From 3c6aaf1358ddab317c3fdddb933fa0103a1e5fd4 Mon Sep 17 00:00:00 2001 From: Frederik Leonhardt Date: Thu, 16 Nov 2017 15:28:00 +1300 Subject: [PATCH] Fix FITS web service classloading * fits.home in catalina.properties must not be quoted * FITS symlink should be owned by tomcat --- roles/internal/fits/tasks/config-ws.yml | 3 ++- roles/internal/fits/tasks/install.yml | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/roles/internal/fits/tasks/config-ws.yml b/roles/internal/fits/tasks/config-ws.yml index 0ba3dc79..66b13490 100644 --- a/roles/internal/fits/tasks/config-ws.yml +++ b/roles/internal/fits/tasks/config-ws.yml @@ -2,7 +2,8 @@ - name: Set fits.home in catalina.properties lineinfile: path: "{{ tomcat8_home }}/conf/catalina.properties" - line: 'fits.home="{{ fits_install_symlink }}"' + regexp: "^fits.home=" + line: "fits.home={{ fits_install_symlink }}" notify: restart tomcat8 - name: Set shared.loader in catalina.properties diff --git a/roles/internal/fits/tasks/install.yml b/roles/internal/fits/tasks/install.yml index ceb16c29..cac977e0 100644 --- a/roles/internal/fits/tasks/install.yml +++ b/roles/internal/fits/tasks/install.yml @@ -14,3 +14,5 @@ state: link src: "{{ fits_install_root }}/fits-{{ fits_version }}" dest: "{{ fits_install_symlink }}" + owner: "{{ fits_user }}" + group: "{{ fits_group }}"