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
diff --git a/vars/main.yml b/vars/main.yml
index ef46a39..064d9b9 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -9,6 +9,8 @@ odoo_required_tools:
- mercurial
- python-pip
- python-psycopg2
+ - python-setuptools
+ - xz-utils
odoo_pypi_packages:
- psycogreen
@@ -16,13 +18,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 }}"