Merge pull request #148 from coopdevs/fix/wkhtmltox_version_by_distro

oyale · web-flow · commit dfdb46dc2ca0 · 2023-01-31T15:50:29.000+01:00
fix: conditional wkhtmltox version
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -111,3 +111,8 @@ odoo_role_logrotate_odoo:
              compress
              delaycompress
       }
+
+# wkhtmltopdf version
+wkhtmltox_version_jammy: "0.12.6.1-2"
+wkhtmltox_version_bionic: "0.12.6-1"
+wkhtmltox_version: "{% if ansible_distribution_release in ['jammy', 'bullseye'] %}{{ wkhtmltox_version_jammy }}{% else %}{{wkhtmltox_version_bionic}}{% endif %}"
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -38,7 +38,7 @@
 
 - name: Download and install wkhtmltopdf only if not already present at any version
   apt:
-    deb: "https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-2/wkhtmltox_0.12.6.1-2.{{ ansible_distribution_release }}_amd64.deb"
+    deb: "https://github.com/wkhtmltopdf/packaging/releases/download/{{ wkhtmltox_version }}/wkhtmltox_{{ wkhtmltox_version }}.{{ ansible_distribution_release }}_amd64.deb"
   when: wkhtmltox_installed.rc == 1
 
 - import_tasks: pyenv.yml

Original file line number	Diff line number	Diff line change
`@@ -111,3 +111,8 @@ odoo_role_logrotate_odoo:`
`111`	`111`	`compress`
`112`	`112`	`delaycompress`
`113`	`113`	`}`
	`114`	`+`
	`115`	`+# wkhtmltopdf version`
	`116`	`+wkhtmltox_version_jammy: "0.12.6.1-2"`
	`117`	`+wkhtmltox_version_bionic: "0.12.6-1"`
	`118`	`+wkhtmltox_version: "{% if ansible_distribution_release in ['jammy', 'bullseye'] %}{{ wkhtmltox_version_jammy }}{% else %}{{wkhtmltox_version_bionic}}{% endif %}"`