From b9620023b4319ef97aba822fe7a8c37f85e61efd Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Mon, 10 Jun 2019 12:50:43 +0200
Subject: [PATCH] ansible-playbooks/general#85 Linting
---
tasks/install.yml | 62 +++++++++++++++++++++++------------------------
tasks/main.yml | 18 ++++++++------
2 files changed, 42 insertions(+), 38 deletions(-)
diff --git a/tasks/install.yml b/tasks/install.yml
index 4e9716f..b3827a3 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -1,66 +1,66 @@
---
# file: roles/wkhtmltopdf/tasks/main.yml
-- name: "Cleanup old version"
+- name: Cleanup old version
file:
- path: '/usr/local/wkhtmltox'
+ path: /usr/local/wkhtmltox
state: absent
-- name: "Ensure dependencies are installed"
+- name: Ensure dependencies are installed
apt:
name: '{{ packages }}'
- state: 'present'
+ state: present
update_cache: yes
vars:
packages:
- - 'fontconfig'
- - 'libfontconfig1'
- - 'libfreetype6'
- - 'libpng12-0'
- - 'libxrender1'
- - 'xfonts-base'
- - 'xfonts-75dpi'
- - 'xvfb'
+ - fontconfig
+ - libfontconfig1
+ - libfreetype6
+ - libpng12-0
+ - libxrender1
+ - xfonts-base
+ - xfonts-75dpi
+ - xvfb
-- name: "Ensure libjpeg dependencies are installed"
+- name: Ensure libjpeg dependencies are installed
apt:
name: '{{ packages }}'
- state: 'present'
+ state: present
vars:
packages:
- - 'libjpeg8'
+ - libjpeg8
when: ansible_distribution_release == 'wheezy'
-- name: "Ensure libjpeg dependencies are installed"
+- name: Ensure libjpeg dependencies are installed
apt:
name: '{{ packages }}'
- state: 'present'
+ state: present
vars:
packages:
- - 'libjpeg62-turbo'
+ - libjpeg62-turbo
when: ansible_distribution_release == 'jessie'
-- name: "Check current version"
- command: 'more /etc/wkhtmltox-version'
+- name: Check current version
+ command: more /etc/wkhtmltox-version
register: wkhtmltox_current_version
- ignore_errors: 'yes'
+ ignore_errors: yes
- block:
- - name: "Download Deb Package"
+ - name: Download Deb Package
get_url:
- url: 'https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/{{ wkhtmltopdf_version_full }}/wkhtmltox_{{ wkhtmltopdf_version_tag }}.{{ ansible_distribution_release }}_{{ wkhtmltopdf_architecture }}.deb'
- dest: '/tmp/wkhtmltox.deb'
+ url: https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/{{ wkhtmltopdf_version_full }}/wkhtmltox_{{ wkhtmltopdf_version_tag }}.{{ ansible_distribution_release }}_{{ wkhtmltopdf_architecture }}.deb
+ dest: /tmp/wkhtmltox.deb
- - name: "Install Deb Package"
- command: 'dpkg -i /tmp/wkhtmltox.deb'
+ - name: Install Deb Package
+ command: dpkg -i /tmp/wkhtmltox.deb
- - name: "Remember version"
+ - name: Remember version
copy:
content: '{{ wkhtmltopdf_version_tag }}'
- dest: '/etc/wkhtmltox-version'
- owner: 'root'
- group: 'root'
- mode: '644'
+ dest: /etc/wkhtmltox-version
+ owner: root
+ group: root
+ mode: 644
when: wkhtmltopdf_version_tag not in wkhtmltox_current_version.stdout
diff --git a/tasks/main.yml b/tasks/main.yml
index 11dd76e..69a45f8 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,17 +1,21 @@
---
# file: roles/wkhtmltopdf/tasks/main.yml
-- name: "Common WkHtmlToPDF"
- set_fact: role_wkhtmltopdf_started=true
- tags: 'always'
+- name: Common WkHtmlToPDF
+ set_fact:
+ role_wkhtmltopdf_started: yes
+ tags:
+ - always
- block:
- include_tasks: install.yml
when: wkhtmltopdf_install|default(false)
- - name: 'Remember that this role had been run'
- set_fact: role_wkhtmltopdf_completed=true
- tags: 'always'
+ - name: Remember that this role had been run
+ set_fact:
+ role_wkhtmltopdf_completed: yes
+ tags:
+ - always
- when: '"wkhtmltopdf" not in excluded_roles and role_wkhtmltopdf_completed is not defined'
+ when: not excluded_roles or "wkhtmltopdf" not in excluded_roles and role_wkhtmltopdf_completed is not defined
--
GitLab