tpiccioli
/
ansible-roles
forked from ISTI-ansible-roles/ansible-roles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tomcat javamelody: maven wants https now.

This commit is contained in:
Andrea Dell'Amico 2020-02-12 16:00:42 +01:00
parent 98dc9c2960
commit 6cbaef0857
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/roles/tomcat/defaults/main.yml
View File

@ -77,6 +77,8 @@ tomcat_jmx_localhost_only: False
# Metrics monitoring via javamelody # Metrics monitoring via javamelody
tomcat_javamelody: True tomcat_javamelody: True
#tomcat_javamelody_version: latest
tomcat_javamelody_version: 1.79.0
# tomcat logging # tomcat logging
tomcat_logdir: '/var/log/tomcat{{ tomcat_version }}' tomcat_logdir: '/var/log/tomcat{{ tomcat_version }}'

18
library/roles/tomcat/tasks/tomcat-pkgs.yml
View File

@ -43,13 +43,13 @@
- name: Configure tomcat defaults - name: Configure tomcat defaults
template: src=tomcat-default.j2 dest=/etc/default/tomcat{{ tomcat_version }} template: src=tomcat-default.j2 dest=/etc/default/tomcat{{ tomcat_version }}
when: tomcat_install_default_conf when: tomcat_install_default_conf | bool
notify: tomcat restart notify: tomcat restart
tags: [ 'tomcat', 'tomcat_default' ] tags: [ 'tomcat', 'tomcat_default' ]
- name: Configure tomcat server.xml - name: Configure tomcat server.xml
template: src=tomcat-server.xml.j2 dest={{ tomcat_conf_dir }}/server.xml template: src=tomcat-server.xml.j2 dest={{ tomcat_conf_dir }}/server.xml
when: tomcat_install_server_xml when: tomcat_install_server_xml | bool
notify: tomcat restart notify: tomcat restart
tags: [ 'tomcat', 'tomcat_serverxml' ] tags: [ 'tomcat', 'tomcat_serverxml' ]
@ -60,7 +60,7 @@
- name: Install a slightly modified catalina.properties - name: Install a slightly modified catalina.properties
copy: src=catalina.properties dest={{ tomcat_conf_dir }}/catalina.properties owner=root group={{ tomcat_user }} mode=0644 copy: src=catalina.properties dest={{ tomcat_conf_dir }}/catalina.properties owner=root group={{ tomcat_user }} mode=0644
when: tomcat_install_default_conf when: tomcat_install_default_conf | bool
notify: tomcat restart notify: tomcat restart
tags: [ 'tomcat', 'tomcat_catalinaprops' ] tags: [ 'tomcat', 'tomcat_catalinaprops' ]
@ -80,13 +80,13 @@
tags: [ 'tomcat', 'tomcat_javamelody' ] tags: [ 'tomcat', 'tomcat_javamelody' ]
- name: Install the javamelody dependency jar into the Java shared libs directory - name: Install the javamelody dependency jar into the Java shared libs directory
maven_artifact: artifact_id=jrobin version=latest group_id=org.jrobin extension=jar dest=/usr/share/java/jrobin.jar verify_checksum=always mode=0644 owner=root group=root maven_artifact: artifact_id=jrobin version=latest group_id=org.jrobin extension=jar dest=/usr/share/java/jrobin.jar verify_checksum=always mode=0644 owner=root group=root repository_url=https://repo1.maven.org/maven2
when: tomcat_javamelody when: tomcat_javamelody | bool
tags: [ 'tomcat', 'tomcat_javamelody' ] tags: [ 'tomcat', 'tomcat_javamelody' ]
- name: Install the javamelody-core jar into the Java shared libs directory - name: Install the javamelody-core jar into the Java shared libs directory
maven_artifact: artifact_id=javamelody-core version={{ tomcat_javamelody_version }} group_id=net.bull.javamelody extension=jar dest=/usr/share/java/javamelody-core.jar verify_checksum=always mode=0644 owner=root group=root maven_artifact: artifact_id=javamelody-core version={{ tomcat_javamelody_version }} group_id=net.bull.javamelody extension=jar dest=/usr/share/java/javamelody-core.jar verify_checksum=always mode=0644 owner=root group=root repository_url=https://repo1.maven.org/maven2
when: tomcat_javamelody when: tomcat_javamelody | bool
tags: [ 'tomcat', 'tomcat_javamelody' ] tags: [ 'tomcat', 'tomcat_javamelody' ]
- name: Create a link to the the javamelody jar and its dependencies if the javamelody support is enabled - name: Create a link to the the javamelody jar and its dependencies if the javamelody support is enabled
@ -94,7 +94,7 @@
with_items: with_items:
- javamelody-core.jar - javamelody-core.jar
- jrobin.jar - jrobin.jar
when: tomcat_javamelody when: tomcat_javamelody | bool
tags: [ 'tomcat', 'tomcat_javamelody' ] tags: [ 'tomcat', 'tomcat_javamelody' ]
- name: Remove the javamelody jar and its dependencies if the javamelody support is disabled - name: Remove the javamelody jar and its dependencies if the javamelody support is disabled
@ -102,5 +102,5 @@
with_items: with_items:
- javamelody-core.jar - javamelody-core.jar
- jrobin.jar - jrobin.jar
when: not tomcat_javamelody when: not tomcat_javamelody | bool
tags: [ 'tomcat', 'tomcat_javamelody' ] tags: [ 'tomcat', 'tomcat_javamelody' ]