From 49dc4378801709a73683296b79cf25b1dca6b0e3 Mon Sep 17 00:00:00 2001
From: Victor LABORIE <vlaborie@evolix.fr>
Date: Wed, 20 Feb 2019 11:28:59 +0100
Subject: [PATCH] tomcat: better tomcat version management

---
 CHANGELOG.md                                  |  1 +
 tomcat/defaults/main.yml                      |  1 +
 tomcat/files/tomcat_stretch.service           | 15 ----------
 tomcat/tasks/main.yml                         |  6 +---
 .../{packages_jessie.yml => packages.yml}     | 14 ++++-----
 tomcat/tasks/packages_stretch.yml             | 29 -------------------
 .../tomcat.service.j2}                        |  4 +--
 7 files changed, 12 insertions(+), 58 deletions(-)
 delete mode 100644 tomcat/files/tomcat_stretch.service
 rename tomcat/tasks/{packages_jessie.yml => packages.yml} (63%)
 delete mode 100644 tomcat/tasks/packages_stretch.yml
 rename tomcat/{files/tomcat_jessie.service => templates/tomcat.service.j2} (61%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 599d24db..7254c63b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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
diff --git a/tomcat/defaults/main.yml b/tomcat/defaults/main.yml
index e555e2cd..74440548 100644
--- a/tomcat/defaults/main.yml
+++ b/tomcat/defaults/main.yml
@@ -1,2 +1,3 @@
 ---
 tomcat_instance_root: '/srv/tomcat'
+tomat_version: 8
diff --git a/tomcat/files/tomcat_stretch.service b/tomcat/files/tomcat_stretch.service
deleted file mode 100644
index 88d5b059..00000000
--- a/tomcat/files/tomcat_stretch.service
+++ /dev/null
@@ -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
diff --git a/tomcat/tasks/main.yml b/tomcat/tasks/main.yml
index 661c9651..545c0813 100644
--- a/tomcat/tasks/main.yml
+++ b/tomcat/tasks/main.yml
@@ -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
diff --git a/tomcat/tasks/packages_jessie.yml b/tomcat/tasks/packages.yml
similarity index 63%
rename from tomcat/tasks/packages_jessie.yml
rename to tomcat/tasks/packages.yml
index 6e618e24..29307736 100644
--- a/tomcat/tasks/packages_jessie.yml
+++ b/tomcat/tasks/packages.yml
@@ -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
diff --git a/tomcat/tasks/packages_stretch.yml b/tomcat/tasks/packages_stretch.yml
deleted file mode 100644
index abce4aae..00000000
--- a/tomcat/tasks/packages_stretch.yml
+++ /dev/null
@@ -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
diff --git a/tomcat/files/tomcat_jessie.service b/tomcat/templates/tomcat.service.j2
similarity index 61%
rename from tomcat/files/tomcat_jessie.service
rename to tomcat/templates/tomcat.service.j2
index 0a5a22d9..e82bfca9 100644
--- a/tomcat/files/tomcat_jessie.service
+++ b/tomcat/templates/tomcat.service.j2
@@ -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]