From f701bbf6fd45f23100fee06e580610d12d44c8ff Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Tue, 5 Jan 2021 10:00:07 +0100
Subject: [PATCH] Update to 2021-01-05 10:00

---
 roles/composer/tasks/install.yml     | 6 ++++++
 roles/diagrams/defaults/main.yml     | 4 ++--
 roles/diagrams/tasks/archive_pre.yml | 2 +-
 roles/diagrams/tasks/install.yml     | 1 +
 roles/letsencrypt/vars/Debian-9.yml  | 6 ++++++
 5 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 roles/letsencrypt/vars/Debian-9.yml

diff --git a/roles/composer/tasks/install.yml b/roles/composer/tasks/install.yml
index 0819956..8594ed8 100644
--- a/roles/composer/tasks/install.yml
+++ b/roles/composer/tasks/install.yml
@@ -1,5 +1,11 @@
 ---
 
+- name: Install dependencies
+  yum:
+    name:
+      - git
+  tags: composer
+
 - name: download composer
   get_url:
     url: https://getcomposer.org/installer
diff --git a/roles/diagrams/defaults/main.yml b/roles/diagrams/defaults/main.yml
index 0f9d338..95d6096 100644
--- a/roles/diagrams/defaults/main.yml
+++ b/roles/diagrams/defaults/main.yml
@@ -1,11 +1,11 @@
 ---
 
 # Veresion of diagrams to deploy
-diagrams_version: 13.8.8
+diagrams_version: 14.1.8
 # URL of the WAR file to deploy
 diagrams_war_url: https://github.com/jgraph/drawio/releases/download/v{{ diagrams_version }}/draw.war
 # Expected sha1 of the WAR file
-diagrams_war_sha1: 99bf8957ab3a4ea11a33387ccd824183007c3ddc
+diagrams_war_sha1: 77e3afd23658f8798a79753a6cfb3f71c0de56a1
 # root directory of the installation
 diagrams_root_dir: /opt/diagrams
 # Should ansible manage upgrades, or just initial install ?
diff --git a/roles/diagrams/tasks/archive_pre.yml b/roles/diagrams/tasks/archive_pre.yml
index e627236..c9d14a9 100644
--- a/roles/diagrams/tasks/archive_pre.yml
+++ b/roles/diagrams/tasks/archive_pre.yml
@@ -5,5 +5,5 @@
   tags: diagrams
 
 - name: Copy the war archive
-  copy: src={{ diagrams_root_dir }}/tomcat/webapps/draw.war dest={{ diagrams_root_dir }}/archives/{{ diagrams_current_version }} remote_src=True
+  copy: src={{ diagrams_root_dir }}/webapps/draw.war dest={{ diagrams_root_dir }}/archives/{{ diagrams_current_version }} remote_src=True
   tags: diagrams
diff --git a/roles/diagrams/tasks/install.yml b/roles/diagrams/tasks/install.yml
index 5bc7de8..0f6bf06 100644
--- a/roles/diagrams/tasks/install.yml
+++ b/roles/diagrams/tasks/install.yml
@@ -10,5 +10,6 @@
     
     - name: Move WAR to the webapp dir
       copy: src={{ diagrams_root_dir }}/tmp/draw.war dest={{ diagrams_root_dir }}/webapps/draw.war remote_src=True
+      notify: restart diagrams
 
   tags: diagrams
diff --git a/roles/letsencrypt/vars/Debian-9.yml b/roles/letsencrypt/vars/Debian-9.yml
new file mode 100644
index 0000000..4851af7
--- /dev/null
+++ b/roles/letsencrypt/vars/Debian-9.yml
@@ -0,0 +1,6 @@
+---
+
+letsencrypt_packages:
+  - python-pip
+  - python-setuptools
+  - curl