tomcat: better tomcat version management

This commit is contained in:
Victor LABORIE 2019-02-20 11:28:59 +01:00
parent 6eb88cf43d
commit 49dc437880
7 changed files with 12 additions and 58 deletions

View File

@ -13,6 +13,7 @@ The **patch** part changes incrementally at each release.
### Added
### Changed
* tomcat: better tomcat version management
### Fixed
* spamassasin: fix sa-update.sh and ensure service is started and enabled

View File

@ -1,2 +1,3 @@
---
tomcat_instance_root: '/srv/tomcat'
tomat_version: 8

View File

@ -1,15 +0,0 @@
[Unit]
Description=Tomcat %u.
After=network.target
[Service]
WorkingDirectory=%h
Environment="CATALINA_BASE=%h"
EnvironmentFile=%h/conf/env
UMask=0002
ExecStart=/usr/share/tomcat8/bin/startup.sh
ExecStop=/usr/share/tomcat8/bin/shutdown.sh
Type=forking
[Install]
WantedBy=default.target

View File

@ -1,8 +1,4 @@
---
- include: packages_jessie.yml
when: ansible_distribution_release == "jessie"
- include: packages_stretch.yml
when: ansible_distribution_major_version | version_compare('9', '>=')
- include: packages.yml
- include: nagios.yml

View File

@ -4,9 +4,9 @@
name: "{{ item }}"
state: present
with_items:
- 'tomcat7'
- 'tomcat7-user'
- 'libpam-systemd'
- "tomcat{{ tomcat_version }}"
- "tomcat{{ tomcat_version }}-user"
- "libpam-systemd"
- name: Create tomcat root dir
file:
@ -17,13 +17,13 @@
mode: "0755"
- name: Copy systemd unit
copy:
src: 'tomcat_jessie.service'
template:
src: 'tomcat.service.j2'
dest: "/etc/systemd/user/tomcat.service"
mode: "0755"
- name: Disable default tomcat7 service
- name: Disable default tomcat service
service:
name: tomcat7
name: "tomcat{{ tomcat_version }}"
state: stopped
enabled: false

View File

@ -1,29 +0,0 @@
---
- name: Install packages
apt:
name: "{{ item }}"
state: present
with_items:
- 'tomcat8'
- 'tomcat8-user'
- 'libpam-systemd'
- name: Create tomcat root dir
file:
path: "{{ tomcat_instance_root }}"
state: directory
owner: 'root'
group: 'root'
mode: "0755"
- name: Copy systemd unit
copy:
src: 'tomcat_stretch.service'
dest: "/etc/systemd/user/tomcat.service"
mode: "0755"
- name: Disable default tomcat8 service
service:
name: tomcat8
state: stopped
enabled: false

View File

@ -7,8 +7,8 @@ WorkingDirectory=%h
Environment="CATALINA_BASE=%h"
EnvironmentFile=%h/conf/env
UMask=0002
ExecStart=/usr/share/tomcat7/bin/startup.sh
ExecStop=/usr/share/tomcat7/bin/shutdown.sh
ExecStart=/usr/share/tomcat{{ tomcat_version }}/bin/startup.sh
ExecStop=/usr/share/tomcat{{ tomcat_version }}/bin/shutdown.sh
Type=forking
[Install]