From dd43174974e164aeee7ff8f430497aa3b8402165 Mon Sep 17 00:00:00 2001 From: jurgenhaas <juergen@paragon-es.de> Date: Mon, 10 Jun 2019 12:52:14 +0200 Subject: [PATCH] ansible-playbooks/general#85 Linting --- tasks/main.yml | 20 ++++++++++++-------- tasks/vpn.yml | 20 ++++++++++---------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index eb8a682..b8d6a36 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -5,16 +5,20 @@ --- # file: roles/vpn/tasks/main.yml -- name: "VPN Role" - set_fact: role_vpn_started=true - tags: 'always' +- name: VPN Role + set_fact: + role_vpn_started: yes + tags: + - always - block: - - import_tasks: 'vpn.yml' + - import_tasks: vpn.yml - - name: 'Remember that this role had been run' - set_fact: role_vpn_completed=true - tags: 'always' + - name: Remember that this role had been run + set_fact: + role_vpn_completed: yes + tags: + - always - when: '"vpn" not in excluded_roles and role_vpn_completed is not defined and vpn is defined and vpn.subnet is defined' + when: not excluded_roles or "vpn" not in excluded_roles and role_vpn_completed is not defined and vpn is defined and vpn.subnet is defined diff --git a/tasks/vpn.yml b/tasks/vpn.yml index 28aa146..dd03c75 100644 --- a/tasks/vpn.yml +++ b/tasks/vpn.yml @@ -1,21 +1,21 @@ --- # file: roles/vpn/tasks/vpn.yml -- name: "Install extra packages" +- name: Install extra packages apt: name: '{{ packages }}' - state: 'present' + state: present vars: packages: - - 'strongswan' + - strongswan -- name: "Configure IPSec" +- name: Configure IPSec template: src: '{{ item }}.jinja2' - dest: '/etc/{{ item }}' - owner: 'root' - group: 'root' - mode: '600' + dest: /etc/{{ item }} + owner: root + group: root + mode: 600 with_items: - - 'ipsec.conf' - - 'ipsec.secrets' + - ipsec.conf + - ipsec.secrets -- GitLab