From 5b371b935a53cf69d32147a715655134eb71e574 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Tue, 21 Aug 2018 10:23:06 +0200
Subject: [PATCH] Update wkhtmltox to version 0.12.5
---
defaults/main.yml | 3 ++-
tasks/install.yml | 35 ++++++++++++++++++++++++++++++-----
2 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/defaults/main.yml b/defaults/main.yml
index d0f395b..29497cb 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,2 +1,3 @@
-wkhtmltopdf_version_full: "0.12.4"
+wkhtmltopdf_version_full: "0.12.5"
+wkhtmltopdf_version_tag: "0.12.5-1"
wkhtmltopdf_architecture: "amd64"
diff --git a/tasks/install.yml b/tasks/install.yml
index 1459612..ad21cb8 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -1,6 +1,11 @@
---
# file: roles/wkhtmltopdf/tasks/main.yml
+- name: "Cleanup old version"
+ file:
+ path: '/usr/local/wkhtmltox'
+ state: absent
+
- name: "Ensure dependencies are installed"
apt:
name: '{{ item }}'
@@ -14,6 +19,7 @@
- 'libxrender1'
- 'xfonts-base'
- 'xfonts-75dpi'
+ - 'xvfb'
- name: "Ensure libjpeg dependencies are installed"
apt:
@@ -31,8 +37,27 @@
- 'libjpeg62-turbo'
when: ansible_distribution_release == 'jessie'
-- name: "Download wkhtmltopdf"
- unarchive:
- src: 'https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/{{ wkhtmltopdf_version_full }}/wkhtmltox-{{ wkhtmltopdf_version_full }}_linux-generic-{{ wkhtmltopdf_architecture }}.tar.xz'
- dest: '/usr/local'
- remote_src: yes
+- name: "Check current version"
+ command: 'more /etc/wkhtmltox-version'
+ register: wkhtmltox_current_version
+ ignore_errors: 'yes'
+
+- block:
+
+ - name: "Download Deb Package"
+ get_url:
+ url: 'https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/{{ wkhtmltopdf_version_full }}/wkhtmltox_{{ wkhtmltopdf_version_tag }}.{{ ansible_distribution_release }}_{{ wkhtmltopdf_architecture }}.deb'
+ dest: '/tmp/wkhtmltox.deb'
+
+ - name: "Install Deb Package"
+ command: 'dpkg -i /tmp/wkhtmltox.deb'
+
+ - name: "Remember version"
+ copy:
+ content: '{{ wkhtmltopdf_version_tag }}'
+ dest: '/etc/wkhtmltox-version'
+ owner: 'root'
+ group: 'root'
+ mode: '644'
+
+ when: wkhtmltopdf_version_tag not in wkhtmltox_current_version.stdout
--
GitLab