From afa71e25e13851ca85608bdfeb40f6b38b179659 Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <adellam@isti.cnr.it>
Date: Tue, 4 Dec 2018 18:36:26 +0100
Subject: [PATCH] Some fixes to the java reverse proxy role.
---
smartgears/java_reverse_proxy/defaults/main.yml | 2 +-
smartgears/java_reverse_proxy/tasks/main.yml | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/smartgears/java_reverse_proxy/defaults/main.yml b/smartgears/java_reverse_proxy/defaults/main.yml
index 881a666..ebfd890 100644
--- a/smartgears/java_reverse_proxy/defaults/main.yml
+++ b/smartgears/java_reverse_proxy/defaults/main.yml
@@ -9,4 +9,4 @@ smartgears_rproxy_base_url: 'http://maven.research-infrastructures.eu/nexus/cont
java_rproxy_display_name: 'Java Reverse Proxy Service'
java_rproxy_targets:
- - { servlet_name: 'ReverseProxy', target_uri: 'https://revproxied-app.example.org/', log: 'true', forwardip: 'true', preserve_host: 'true', preserve_cookies: 'true', handle_redirects: 'true', socket_timeout: '60000', read_timeout: '60000', url_pattern: [ '/dest1/*', '/dest2/*' ] }
\ No newline at end of file
+ - { servlet_name: 'ReverseProxy', target_uri: 'https://revproxied-app.example.org/', log: 'true', forwardip: 'true', preserve_host: 'true', preserve_cookies: 'true', handle_redirects: 'true', socket_timeout: '60000', read_timeout: '60000', url_patterns: [ '/dest1/*', '/dest2/*' ] }
\ No newline at end of file
diff --git a/smartgears/java_reverse_proxy/tasks/main.yml b/smartgears/java_reverse_proxy/tasks/main.yml
index 6392073..f33d306 100644
--- a/smartgears/java_reverse_proxy/tasks/main.yml
+++ b/smartgears/java_reverse_proxy/tasks/main.yml
@@ -40,9 +40,6 @@
template: src=web.xml dest={{ smartgears_instance_path }}/webapps/{{ java_rproxy_service_name }}/WEB-INF/web.xml mode=0440
notify: Restart smartgears
-
-# TODO: unarchive the war file and install the web.xml.
-
become: True
become_user: '{{ d4science_user }}'
when: java_rproxy_service_install