Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[IMP] wkhtmltox: handle the installation of wkhtmltox 0.12.4 #65

Merged
merged 1 commit into from
Jan 30, 2018
Merged

[IMP] wkhtmltox: handle the installation of wkhtmltox 0.12.4 #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ odoo_repo_depth: 1 # Set to 0 to clone the full history (slower)
# (this option is not supported with hg)

# Third party programs options
odoo_wkhtmltox_version: 0.12.1 # Download URLs available in the
# 'odoo_wkhtmltox_urls' variable
# (see 'vars/main.yml')
odoo_reportlab_font_url: http://www.reportlab.com/ftp/pfbfer.zip

# Tasks related to PostgreSQL
Expand Down
18 changes: 14 additions & 4 deletions tasks/wkhtmltox.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,17 @@
with_items: "{{ odoo_wkhtmltox_depends }}"
when: odoo_wkhtmltox_version is defined and odoo_wkhtmltox_version != False and odoo_wkhtmltox_pkg.stat.exists

- name: Install wkhtmltox
apt: deb="/root/wkhtmltox-{{ odoo_wkhtmltox_version }}_linux-{{ ansible_distribution_release }}-{{ odoo_debian_arch }}.deb"
force=yes
when: odoo_wkhtmltox_version is defined and odoo_wkhtmltox_version != False and odoo_wkhtmltox_pkg.stat.exists
- name: Install wkhtmltox (Debian package)
apt:
deb: "{{ odoo_wkhtmltox_dest }}"
force: yes
when: odoo_wkhtmltox_version is defined and odoo_wkhtmltox_version != False and odoo_wkhtmltox_pkg.stat.exists and odoo_wkhtmltox_pkg.stat.mimetype in ['application/x-debian-package', 'application/vnd.debian.binary-package']

- name: Install wkhtmltox (generic package)
unarchive:
remote_src: yes
src: "{{ odoo_wkhtmltox_dest }}"
dest: /usr/local
extra_opts: "--strip-components=1"
creates: /usr/local/bin/wkhtmltopdf
when: odoo_wkhtmltox_version is defined and odoo_wkhtmltox_version != False and odoo_wkhtmltox_pkg.stat.exists and odoo_wkhtmltox_pkg.stat.mimetype == 'application/x-xz'
3 changes: 3 additions & 0 deletions tests/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,6 @@ echo "== CHECK THE SERVICE STATUS =="
sudo -E service odoo-$ODOO_INSTALL_TYPE status || exit 1
sleep 3 && if ! wget http://localhost:8069; then tail -n 100 /var/log/odoo/*.log && exit 1; fi
sudo -E service odoo-$ODOO_INSTALL_TYPE stop || exit 1

echo "== CHECK WKHTMLTOPDF =="
wkhtmltopdf --version
2 changes: 2 additions & 0 deletions vars/Debian-8_Odoo-10.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ odoo_buildout_build_dependencies:
- liblcms2-dev
- libwebp-dev

odoo_wkhtmltox_version: 0.12.1.2

odoo_wkhtmltox_depends:
- fontconfig
- libfontconfig1
Expand Down
2 changes: 2 additions & 0 deletions vars/Debian-8_Odoo-8.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ odoo_buildout_build_dependencies:
- liblcms2-dev
- libwebp-dev

odoo_wkhtmltox_version: 0.12.1.2

odoo_wkhtmltox_depends:
- fontconfig
- libfontconfig1
Expand Down
2 changes: 2 additions & 0 deletions vars/Debian-8_Odoo-9.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ odoo_buildout_build_dependencies:
- liblcms2-dev
- libwebp-dev

odoo_wkhtmltox_version: 0.12.1.2

odoo_wkhtmltox_depends:
- fontconfig
- libfontconfig1
Expand Down
6 changes: 2 additions & 4 deletions vars/Debian-9_Odoo-10.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,16 +93,14 @@ odoo_buildout_build_dependencies:
- liblcms2-dev
- libwebp-dev

odoo_wkhtmltox_version: 0.12.4

odoo_wkhtmltox_depends:
- fontconfig
- libfontconfig1
- libfreetype6
- libpng12-0
- zlib1g
- libssl1.0.0
- libx11-6
- libxext6
- libxrender1
- libstdc++6
- libc6
- libjpeg62-turbo
6 changes: 2 additions & 4 deletions vars/Debian-9_Odoo-11.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,16 +90,14 @@ odoo_buildout_build_dependencies:
odoo_buildout_venv_cmd: "python3 -m virtualenv --no-setuptools --python=python3 {{ odoo_buildout_venv_path }}"
odoo_pip_venv_cmd: "python3 -m virtualenv --python=python3 {{ odoo_pip_venv_path }}"

odoo_wkhtmltox_version: 0.12.4

odoo_wkhtmltox_depends:
- fontconfig
- libfontconfig1
- libfreetype6
- libpng12-0
- zlib1g
- libssl1.0.0
- libx11-6
- libxext6
- libxrender1
- libstdc++6
- libc6
- libjpeg62-turbo
6 changes: 2 additions & 4 deletions vars/Debian-9_Odoo-8.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,16 +80,14 @@ odoo_buildout_build_dependencies:
- liblcms2-dev
- libwebp-dev

odoo_wkhtmltox_version: 0.12.4

odoo_wkhtmltox_depends:
- fontconfig
- libfontconfig1
- libfreetype6
- libpng12-0
- zlib1g
- libssl1.0.0
- libx11-6
- libxext6
- libxrender1
- libstdc++6
- libc6
- libjpeg62-turbo
6 changes: 2 additions & 4 deletions vars/Debian-9_Odoo-9.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,16 +89,14 @@ odoo_buildout_build_dependencies:
- liblcms2-dev
- libwebp-dev

odoo_wkhtmltox_version: 0.12.4

odoo_wkhtmltox_depends:
- fontconfig
- libfontconfig1
- libfreetype6
- libpng12-0
- zlib1g
- libssl1.0.0
- libx11-6
- libxext6
- libxrender1
- libstdc++6
- libc6
- libjpeg62-turbo
2 changes: 2 additions & 0 deletions vars/Ubuntu-14_Odoo-10.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ odoo_buildout_build_dependencies:
- liblcms2-dev
- libwebp-dev

odoo_wkhtmltox_version: 0.12.1

odoo_wkhtmltox_depends:
- fontconfig
- libfontconfig1
Expand Down
2 changes: 2 additions & 0 deletions vars/Ubuntu-14_Odoo-8.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ odoo_buildout_build_dependencies:
- liblcms2-dev
- libwebp-dev

odoo_wkhtmltox_version: 0.12.1

odoo_wkhtmltox_depends:
- fontconfig
- libfontconfig1
Expand Down
2 changes: 2 additions & 0 deletions vars/Ubuntu-14_Odoo-9.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ odoo_buildout_build_dependencies:
- liblcms2-dev
- libwebp-dev

odoo_wkhtmltox_version: 0.12.1

odoo_wkhtmltox_depends:
- fontconfig
- libfontconfig1
Expand Down
5 changes: 5 additions & 0 deletions vars/Ubuntu-16_Odoo-10.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,13 @@ odoo_wkhtmltox_depends:
- libc6
- libjpeg-turbo8

odoo_wkhtmltox_version: 0.12.1

# Try Trusty's package if Xenial one is not found
odoo_wkhtmltox_urls:
# Debian packages
- https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/{{ odoo_wkhtmltox_version }}/wkhtmltox-{{ odoo_wkhtmltox_version }}_linux-{{ ansible_distribution_release }}-{{ odoo_debian_arch }}.deb
- https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/{{ odoo_wkhtmltox_version }}/wkhtmltox-{{ odoo_wkhtmltox_version }}_linux-trusty-{{ 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
- https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/{{ odoo_wkhtmltox_version }}/wkhtmltox-{{ odoo_wkhtmltox_version }}_linux-generic-{{ odoo_debian_arch }}.tar.xz
18 changes: 7 additions & 11 deletions vars/Ubuntu-16_Odoo-11.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,25 +95,21 @@ odoo_buildout_build_dependencies:
- liblcms2-dev
- libwebp-dev

odoo_buildout_venv_cmd: "virtualenv --no-setuptools --python=python3 {{ odoo_buildout_venv_path }}"
odoo_pip_venv_cmd: "virtualenv --python=python3 {{ odoo_pip_venv_path }}"

odoo_wkhtmltox_version: 0.12.4

odoo_wkhtmltox_depends:
- fontconfig
- libfontconfig1
- libfreetype6
- libpng12-0
- zlib1g
- libssl1.0.0
- libx11-6
- libxext6
- libxrender1
- libstdc++6
- libc6
- libjpeg-turbo8

odoo_buildout_venv_cmd: "virtualenv --no-setuptools --python=python3 {{ odoo_buildout_venv_path }}"
odoo_pip_venv_cmd: "virtualenv --python=python3 {{ odoo_pip_venv_path }}"

# Try Trusty's package if Xenial one is not found
odoo_wkhtmltox_urls:
- https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/{{ odoo_wkhtmltox_version }}/wkhtmltox-{{ odoo_wkhtmltox_version }}_linux-{{ ansible_distribution_release }}-{{ odoo_debian_arch }}.deb
- https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/{{ odoo_wkhtmltox_version }}/wkhtmltox-{{ odoo_wkhtmltox_version }}_linux-trusty-{{ 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
- https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/{{ odoo_wkhtmltox_version }}/wkhtmltox-{{ odoo_wkhtmltox_version }}_linux-generic-{{ odoo_debian_arch }}.tar.xz
5 changes: 5 additions & 0 deletions vars/Ubuntu-16_Odoo-8.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ odoo_buildout_build_dependencies:
- liblcms2-dev
- libwebp-dev

odoo_wkhtmltox_version: 0.12.1

odoo_wkhtmltox_depends:
- fontconfig
- libfontconfig1
Expand All @@ -92,6 +94,9 @@ odoo_wkhtmltox_depends:

# Try Trusty's package if Xenial one is not found
odoo_wkhtmltox_urls:
# Debian packages
- https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/{{ odoo_wkhtmltox_version }}/wkhtmltox-{{ odoo_wkhtmltox_version }}_linux-{{ ansible_distribution_release }}-{{ odoo_debian_arch }}.deb
- https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/{{ odoo_wkhtmltox_version }}/wkhtmltox-{{ odoo_wkhtmltox_version }}_linux-trusty-{{ 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
- https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/{{ odoo_wkhtmltox_version }}/wkhtmltox-{{ odoo_wkhtmltox_version }}_linux-generic-{{ odoo_debian_arch }}.tar.xz
5 changes: 5 additions & 0 deletions vars/Ubuntu-16_Odoo-9.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ odoo_buildout_build_dependencies:
- liblcms2-dev
- libwebp-dev

odoo_wkhtmltox_version: 0.12.1

odoo_wkhtmltox_depends:
- fontconfig
- libfontconfig1
Expand All @@ -102,6 +104,9 @@ odoo_wkhtmltox_depends:

# Try Trusty's package if Xenial one is not found
odoo_wkhtmltox_urls:
# Debian packages
- https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/{{ odoo_wkhtmltox_version }}/wkhtmltox-{{ odoo_wkhtmltox_version }}_linux-{{ ansible_distribution_release }}-{{ odoo_debian_arch }}.deb
- https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/{{ odoo_wkhtmltox_version }}/wkhtmltox-{{ odoo_wkhtmltox_version }}_linux-trusty-{{ 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
- https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/{{ odoo_wkhtmltox_version }}/wkhtmltox-{{ odoo_wkhtmltox_version }}_linux-generic-{{ odoo_debian_arch }}.tar.xz
7 changes: 6 additions & 1 deletion vars/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,16 @@ 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_urls:
# Debian packages
- 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
- https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/{{ odoo_wkhtmltox_version }}/wkhtmltox-{{ odoo_wkhtmltox_version }}_linux-generic-{{ odoo_debian_arch }}.tar.xz

odoo_wkhtmltox_dest: "/root/wkhtmltox-{{ odoo_wkhtmltox_version }}_linux-{{ ansible_distribution_release }}-{{ odoo_debian_arch }}.deb"
odoo_wkhtmltox_dest: "/root/wkhtmltox-{{ odoo_wkhtmltox_version }}_linux-{{ ansible_distribution_release }}-{{ odoo_debian_arch }}"

# == NodeJS + npm ==
odoo_nodejs_apt_package: "nodejs=0.10*"
Expand Down