From 0da9027652328490c11dc0a5a664295b0cda7236 Mon Sep 17 00:00:00 2001 From: Pedro Salgado Date: Sun, 11 Dec 2016 18:08:41 -0700 Subject: [PATCH 1/2] updated runtime dependencies. --- defaults/main.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index 540b0db..95e326a 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -33,7 +33,17 @@ wkhtmltopdf_dir_source_version: "{{ wkhtmltopdf_dir_source }}/wkhtmltox-{{ wkhtm wkhtmltopdf_force_build: no wkhtmltopdf_source_dependencies: - - xorg + - fontconfig + - freetype + - glibc + - libstdc++ + - libX11 + - libXext + - libXrender + - openssl + - xorg-x11-fonts-Type1 + - xorg-x11-fonts-75dpi + - zlib wkhtmltopdf_slug: wkhtmltopdf/wkhtmltopdf From fbaa24256e1c7bdc1570bde5de31efb1ef2aa9ed Mon Sep 17 00:00:00 2001 From: Pedro Salgado Date: Sun, 11 Dec 2016 18:09:47 -0700 Subject: [PATCH 2/2] renamed wkhtmltopdf_source_dependencies to wkhtmltopdf_runtime_dependencies. --- README.md | 4 ++-- defaults/main.yml | 2 +- tasks/source/debug.yml | 2 +- tasks/source/main.yml | 2 +- tasks/source/validation.yml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 730b72f..cb6feed 100644 --- a/README.md +++ b/README.md @@ -55,9 +55,9 @@ Variables used in the `build` installation process. - **wkhtmltopdf_dir_chroot**: directory to setup chroot environment. - **wkhtmltopdf_dir_source**: directory where to store the source tarball. - **wkhtmltopdf_dir_source_version**: directory where to extract the tarball or clone the git repository. -- **wkhtmltopdf_source_dependencies**: list of packages needed to build the software. +- **wkhtmltopdf_force_build**: compile software. +- **wkhtmltopdf_runtime_dependencies**: list of packages needed to run the software. - **wkhtmltopdf_tarball_download_url**: URL to download tarball. -- **wkhtmltopdf_force_build**: . - **wkhtmltopdf_slug**: git repository slug to be cloned. - **wkhtmltopdf_tarball**: tarball basename. diff --git a/defaults/main.yml b/defaults/main.yml index 95e326a..1dd76b9 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -32,7 +32,7 @@ wkhtmltopdf_dir_source_version: "{{ wkhtmltopdf_dir_source }}/wkhtmltox-{{ wkhtm wkhtmltopdf_force_build: no -wkhtmltopdf_source_dependencies: +wkhtmltopdf_runtime_dependencies: - fontconfig - freetype - glibc diff --git a/tasks/source/debug.yml b/tasks/source/debug.yml index 9234a10..9cb6af5 100644 --- a/tasks/source/debug.yml +++ b/tasks/source/debug.yml @@ -19,7 +19,7 @@ - wkhtmltopdf_dir_source - wkhtmltopdf_dir_source_version - wkhtmltopdf_force_build - - wkhtmltopdf_source_dependencies + - wkhtmltopdf_runtime_dependencies - wkhtmltopdf_slug - wkhtmltopdf_tarball - wkhtmltopdf_tarball_download_url diff --git a/tasks/source/main.yml b/tasks/source/main.yml index a6de5b3..03e576b 100644 --- a/tasks/source/main.yml +++ b/tasks/source/main.yml @@ -22,7 +22,7 @@ become: yes when: (task_version_installed is defined and task_version_installed.rc != 0) with_items: - - "{{ wkhtmltopdf_source_dependencies }}" + - "{{ wkhtmltopdf_runtime_dependencies }}" - name: build | download and install source (using tarball or git) include: "{{ wkhtmltopdf_build }}.yml" diff --git a/tasks/source/validation.yml b/tasks/source/validation.yml index c1683a6..a3c30b0 100644 --- a/tasks/source/validation.yml +++ b/tasks/source/validation.yml @@ -18,7 +18,7 @@ - wkhtmltopdf_dir_source - wkhtmltopdf_dir_source_version - wkhtmltopdf_force_build - - wkhtmltopdf_source_dependencies + - wkhtmltopdf_runtime_dependencies - wkhtmltopdf_slug - wkhtmltopdf_tarball - wkhtmltopdf_tarball_download_url