From c038908b896246e7b8b2a722e70151a877e6568a Mon Sep 17 00:00:00 2001 From: Jannik Beyerstedt Date: Tue, 12 Nov 2019 21:34:32 +0100 Subject: [PATCH] [TIDY] yaml auto-format --- handlers/main.yml | 2 +- meta/main.yml | 18 ++++++++++-------- tasks/main.yml | 12 ++++-------- tasks/setup-Darwin.yml | 2 +- tasks/setup-Debian.yml | 2 +- vars/main.yml | 2 -- 6 files changed, 17 insertions(+), 21 deletions(-) delete mode 100644 vars/main.yml diff --git a/handlers/main.yml b/handlers/main.yml index 4ed6a86..7c2318e 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -1,2 +1,2 @@ --- -# handlers file for tinc \ No newline at end of file +# handlers file for tinc diff --git a/meta/main.yml b/meta/main.yml index 7ff40ce..e77f11c 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -7,17 +7,19 @@ galaxy_info: min_ansible_version: 2.4 platforms: - - name: Debian - versions: - - all - - name: Darwin - versions: - - all + - name: Debian + versions: + - all + - name: Darwin + versions: + - all - galaxy_tags: [] + galaxy_tags: + [] # List tags for your role here, one per line. # Be sure to remove the '[]' above, if you add tags to this list. -dependencies: [] +dependencies: + [] # List your role dependencies here, one per line. # Be sure to remove the '[]' above, if you add tags to this list. diff --git a/tasks/main.yml b/tasks/main.yml index a15213b..0f4e1c8 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -12,13 +12,12 @@ - "setup-{{ ansible_distribution }}.yml" - "setup-{{ (override_os_family is defined) | ternary(override_os_family,ansible_os_family) }}.yml" - - name: Main - Create tinc directories become: yes file: path: "{{ tinc_base_dir }}/{{ tinc_vpn_id }}/hosts" state: directory - mode: '0755' + mode: "0755" - name: Main - Create new host keypair become: yes @@ -48,30 +47,27 @@ src: "{{ role_path }}/templates/hostfile.j2" dest: "{{ tinc_base_dir }}/{{ tinc_vpn_id }}/hosts/{{ ansible_hostname }}" - - name: Main - Create tinc-up script become: yes template: src: "{{ role_path }}/templates/tinc-up.j2" dest: "{{ tinc_base_dir }}/{{ tinc_vpn_id }}/tinc-up" - mode: '0755' + mode: "0755" - name: Main - Create tinc-down script become: yes template: src: "{{ role_path }}/templates/tinc-down.j2" dest: "{{ tinc_base_dir }}/{{ tinc_vpn_id }}/tinc-down" - mode: '0755' + mode: "0755" - -- name: Tinc - Fetch all hostfiles +- name: Main - Fetch all hostfiles become: yes fetch: src: "{{ tinc_base_dir }}/{{ tinc_vpn_id }}/hosts/{{ ansible_hostname }}" dest: "{{ role_path }}/files/tmp/{{ ansible_hostname }}" flat: yes - - name: "Main - Enable {{ tinc_vpn_id }}" become: yes block: diff --git a/tasks/setup-Darwin.yml b/tasks/setup-Darwin.yml index 0b39743..58439ff 100644 --- a/tasks/setup-Darwin.yml +++ b/tasks/setup-Darwin.yml @@ -7,4 +7,4 @@ state: present vars: packages: - - tinc + - tinc diff --git a/tasks/setup-Debian.yml b/tasks/setup-Debian.yml index 8f858b2..8d77e4d 100644 --- a/tasks/setup-Debian.yml +++ b/tasks/setup-Debian.yml @@ -8,4 +8,4 @@ state: present vars: packages: - - tinc + - tinc diff --git a/vars/main.yml b/vars/main.yml deleted file mode 100644 index 2df52f6..0000000 --- a/vars/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# vars file for tinc \ No newline at end of file