tomcat: better tomcat version management
This commit is contained in:
parent
6eb88cf43d
commit
49dc437880
|
@ -13,6 +13,7 @@ The **patch** part changes incrementally at each release.
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
* tomcat: better tomcat version management
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
* spamassasin: fix sa-update.sh and ensure service is started and enabled
|
* spamassasin: fix sa-update.sh and ensure service is started and enabled
|
||||||
|
|
|
@ -1,2 +1,3 @@
|
||||||
---
|
---
|
||||||
tomcat_instance_root: '/srv/tomcat'
|
tomcat_instance_root: '/srv/tomcat'
|
||||||
|
tomat_version: 8
|
||||||
|
|
|
@ -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
|
|
|
@ -1,8 +1,4 @@
|
||||||
---
|
---
|
||||||
- include: packages_jessie.yml
|
- include: packages.yml
|
||||||
when: ansible_distribution_release == "jessie"
|
|
||||||
|
|
||||||
- include: packages_stretch.yml
|
|
||||||
when: ansible_distribution_major_version | version_compare('9', '>=')
|
|
||||||
|
|
||||||
- include: nagios.yml
|
- include: nagios.yml
|
||||||
|
|
|
@ -4,9 +4,9 @@
|
||||||
name: "{{ item }}"
|
name: "{{ item }}"
|
||||||
state: present
|
state: present
|
||||||
with_items:
|
with_items:
|
||||||
- 'tomcat7'
|
- "tomcat{{ tomcat_version }}"
|
||||||
- 'tomcat7-user'
|
- "tomcat{{ tomcat_version }}-user"
|
||||||
- 'libpam-systemd'
|
- "libpam-systemd"
|
||||||
|
|
||||||
- name: Create tomcat root dir
|
- name: Create tomcat root dir
|
||||||
file:
|
file:
|
||||||
|
@ -17,13 +17,13 @@
|
||||||
mode: "0755"
|
mode: "0755"
|
||||||
|
|
||||||
- name: Copy systemd unit
|
- name: Copy systemd unit
|
||||||
copy:
|
template:
|
||||||
src: 'tomcat_jessie.service'
|
src: 'tomcat.service.j2'
|
||||||
dest: "/etc/systemd/user/tomcat.service"
|
dest: "/etc/systemd/user/tomcat.service"
|
||||||
mode: "0755"
|
mode: "0755"
|
||||||
|
|
||||||
- name: Disable default tomcat7 service
|
- name: Disable default tomcat service
|
||||||
service:
|
service:
|
||||||
name: tomcat7
|
name: "tomcat{{ tomcat_version }}"
|
||||||
state: stopped
|
state: stopped
|
||||||
enabled: false
|
enabled: false
|
|
@ -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
|
|
|
@ -7,8 +7,8 @@ WorkingDirectory=%h
|
||||||
Environment="CATALINA_BASE=%h"
|
Environment="CATALINA_BASE=%h"
|
||||||
EnvironmentFile=%h/conf/env
|
EnvironmentFile=%h/conf/env
|
||||||
UMask=0002
|
UMask=0002
|
||||||
ExecStart=/usr/share/tomcat7/bin/startup.sh
|
ExecStart=/usr/share/tomcat{{ tomcat_version }}/bin/startup.sh
|
||||||
ExecStop=/usr/share/tomcat7/bin/shutdown.sh
|
ExecStop=/usr/share/tomcat{{ tomcat_version }}/bin/shutdown.sh
|
||||||
Type=forking
|
Type=forking
|
||||||
|
|
||||||
[Install]
|
[Install]
|
Loading…
Reference in a new issue