From b5c16cf2af54eeb763c4e70495d717a46ca856a3 Mon Sep 17 00:00:00 2001 From: Nicolas Charlot Date: Tue, 7 Aug 2018 14:59:27 +0200 Subject: [PATCH 1/3] Upgraded Wkhtmltopdf to 0.12.5 Append missing required package xz-utils --- vars/main.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/vars/main.yml b/vars/main.yml index ef46a39..895dfee 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -9,6 +9,7 @@ odoo_required_tools: - mercurial - python-pip - python-psycopg2 + - xz-utils odoo_pypi_packages: - psycogreen @@ -16,13 +17,14 @@ odoo_pypi_packages: odoo_buildout_venv_cmd: "virtualenv --no-setuptools {{ odoo_buildout_venv_path }}" odoo_pip_venv_cmd: "virtualenv {{ odoo_pip_venv_path }}" -odoo_wkhtmltox_version: 0.12.4 +odoo_wkhtmltox_version: 0.12.5 odoo_wkhtmltox_urls: # Debian packages + - https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/{{ odoo_wkhtmltox_version }}/wkhtmltox_{{ odoo_wkhtmltox_version }}-1.{{ ansible_distribution_release }}_{{ odoo_debian_arch }}.deb - https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/{{ odoo_wkhtmltox_version }}/wkhtmltox-{{ odoo_wkhtmltox_version }}_linux-{{ ansible_distribution_release }}-{{ odoo_debian_arch }}.deb - http://nightly.odoo.com/extra/wkhtmltox-{{ odoo_wkhtmltox_version }}_linux-{{ ansible_distribution_release }}-{{ odoo_debian_arch }}.deb - # generic tar.gz packages + # generic tar.xz packages - https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/{{ odoo_wkhtmltox_version }}/wkhtmltox-{{ odoo_wkhtmltox_version }}_linux-generic-{{ odoo_debian_arch }}.tar.xz odoo_wkhtmltox_dest: "/opt/wkhtmltox-{{ odoo_wkhtmltox_version }}_linux-{{ ansible_distribution_release }}-{{ odoo_debian_arch }}" From 619ee3bc0b95ced005a669a70c8faba8bcf038ca Mon Sep 17 00:00:00 2001 From: Nicolas Charlot Date: Tue, 7 Aug 2018 15:19:29 +0200 Subject: [PATCH 2/3] Forced update of wkhtmltox dest if changed --- tasks/wkhtmltox.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tasks/wkhtmltox.yml b/tasks/wkhtmltox.yml index 3207417..0eb265d 100644 --- a/tasks/wkhtmltox.yml +++ b/tasks/wkhtmltox.yml @@ -6,6 +6,7 @@ - name: Download wkhtmltox get_url: url={{ item }} dest={{ odoo_wkhtmltox_dest }} + force=yes with_items: "{{ odoo_wkhtmltox_urls }}" ignore_errors: True when: odoo_wkhtmltox_version is defined and odoo_wkhtmltox_version != False From 0cd73b5fae6bacc11a2f1351582b491e3347d823 Mon Sep 17 00:00:00 2001 From: Nicolas Charlot Date: Tue, 7 Aug 2018 15:22:25 +0200 Subject: [PATCH 3/3] Append missing package (python-setuptools required by psycogreen) --- vars/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/vars/main.yml b/vars/main.yml index 895dfee..064d9b9 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -9,6 +9,7 @@ odoo_required_tools: - mercurial - python-pip - python-psycopg2 + - python-setuptools - xz-utils odoo_pypi_packages: