From 4737fece2c255a03997dc25c6a1e125e797a61bf Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Tue, 22 Feb 2022 18:00:11 +0100 Subject: [PATCH] Update to 2022-02-22 18:00 --- roles/bookstack/defaults/main.yml | 3 +++ roles/bookstack/meta/main.yml | 2 ++ roles/bookstack/templates/env.j2 | 4 ++++ roles/bookstack/templates/php.conf.j2 | 2 +- roles/wkhtmltopdf/defaults/main.yml | 3 +++ roles/wkhtmltopdf/tasks/main.yml | 15 +++++++++++++++ roles/wkhtmltopdf/vars/RedHat-8.yml | 3 +++ 7 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 roles/wkhtmltopdf/defaults/main.yml create mode 100644 roles/wkhtmltopdf/tasks/main.yml create mode 100644 roles/wkhtmltopdf/vars/RedHat-8.yml diff --git a/roles/bookstack/defaults/main.yml b/roles/bookstack/defaults/main.yml index bfa76f3..9a4f885 100644 --- a/roles/bookstack/defaults/main.yml +++ b/roles/bookstack/defaults/main.yml @@ -69,6 +69,9 @@ bookstack_default_lang: fr # Session lifetime, in minutes bookstack_session_lifetime: 480 +# PDF Exporter. Can be either dompdf (the default) or wkhtmltopdf +bookstack_pdf_exporter: dompdf + # You can set custom directive with this: # bookstack_settings: # AUTH_METHOD: saml2 diff --git a/roles/bookstack/meta/main.yml b/roles/bookstack/meta/main.yml index 9391075..3c7d723 100644 --- a/roles/bookstack/meta/main.yml +++ b/roles/bookstack/meta/main.yml @@ -6,3 +6,5 @@ dependencies: - role: mysql_server when: bookstack_db_server in ['localhost','127.0.0.1'] - role: composer + - role: wkhtmltopdf + when: bookstack_pdf_exporter == 'wkhtmltopdf' diff --git a/roles/bookstack/templates/env.j2 b/roles/bookstack/templates/env.j2 index b9a3f40..c94a281 100644 --- a/roles/bookstack/templates/env.j2 +++ b/roles/bookstack/templates/env.j2 @@ -27,3 +27,7 @@ QUEUE_CONNECTION=database {% for key in bookstack_settings.keys() | list %} {{ key }}="{{ bookstack_settings[key] }}" {% endfor %} +{% if bookstack_pdf_exporter == 'wkhtmltopdf' %} +WKHTMLTOPDF=/usr/local/bin/wkhtmltopdf +ALLOW_UNTRUSTED_SERVER_FETCHING=true +{% endif %} diff --git a/roles/bookstack/templates/php.conf.j2 b/roles/bookstack/templates/php.conf.j2 index 51a3b4b..e3719a9 100644 --- a/roles/bookstack/templates/php.conf.j2 +++ b/roles/bookstack/templates/php.conf.j2 @@ -25,7 +25,7 @@ php_admin_value[upload_tmp_dir] = {{ bookstack_root_dir }}/tmp php_admin_value[sys_temp_dir] = {{ bookstack_root_dir }}/tmp php_admin_value[post_max_size] = 100M php_admin_value[upload_max_filesize] = 100M -php_admin_value[disable_functions] = system, show_source, symlink, exec, dl, shell_exec, passthru, phpinfo, escapeshellarg, escapeshellcmd +php_admin_value[disable_functions] = system, show_source, symlink, exec, dl, shell_exec, passthru, phpinfo, escapeshellcmd php_admin_value[open_basedir] = {{ bookstack_root_dir }}:/usr/share/pear/:/usr/share/php/ php_admin_value[max_execution_time] = 60 php_admin_value[max_input_time] = 60 diff --git a/roles/wkhtmltopdf/defaults/main.yml b/roles/wkhtmltopdf/defaults/main.yml new file mode 100644 index 0000000..2945d3b --- /dev/null +++ b/roles/wkhtmltopdf/defaults/main.yml @@ -0,0 +1,3 @@ +--- + +wkhtmltopdf_version: 0.12.6-1 diff --git a/roles/wkhtmltopdf/tasks/main.yml b/roles/wkhtmltopdf/tasks/main.yml new file mode 100644 index 0000000..3ec57e6 --- /dev/null +++ b/roles/wkhtmltopdf/tasks/main.yml @@ -0,0 +1,15 @@ +--- + +# Load distribution specific variables +- include_vars: "{{ item }}" + with_first_found: + - "{{ role_path }}/vars/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml" + - "{{ role_path }}/vars/{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml" + - "{{ role_path }}/vars/{{ ansible_distribution }}.yml" + - "{{ role_path }}/vars/{{ ansible_os_family }}.yml" + tags: wkhtmltopdf + +- name: Install wkhtmltopdf + yum: name={{ wkhtmltopdf_package_url }} disable_gpg_check=True + when: ansible_os_family == 'RedHat' + tags: wkhtmltopdf diff --git a/roles/wkhtmltopdf/vars/RedHat-8.yml b/roles/wkhtmltopdf/vars/RedHat-8.yml new file mode 100644 index 0000000..862a915 --- /dev/null +++ b/roles/wkhtmltopdf/vars/RedHat-8.yml @@ -0,0 +1,3 @@ +--- + +wkhtmltopdf_package_url: https://github.com/wkhtmltopdf/packaging/releases/download/{{ wkhtmltopdf_version }}/wkhtmltox-{{ wkhtmltopdf_version }}.centos8.x86_64.rpm