From 166c67477bce5efd80c3664b0613e8dcae0cf5ec Mon Sep 17 00:00:00 2001 From: n0trax Date: Fri, 8 Sep 2017 17:17:26 +0200 Subject: [PATCH] Add relaxed yamllint config and fix errors --- .yamllint | 19 +++++++++++++++++++ include/loctevm-provide-iso.inc.yml | 5 ++--- playbooks/servers.yml | 2 +- roles/ffmwu-meshing/tasks/fastd-config.yml | 4 ++-- roles/server-repos/vars/main.yml | 1 - roles/service-ntpd/tasks/main.yml | 1 - 6 files changed, 24 insertions(+), 8 deletions(-) create mode 100644 .yamllint diff --git a/.yamllint b/.yamllint new file mode 100644 index 0000000..6284cf1 --- /dev/null +++ b/.yamllint @@ -0,0 +1,19 @@ +extends: default + +rules: + braces: {max-spaces-inside: 1, level: error} + brackets: {max-spaces-inside: 1, level: error} + colons: {max-spaces-after: -1, level: error} + commas: {max-spaces-after: -1, level: error} + comments: disable + comments-indentation: disable + document-start: disable + empty-lines: {max: 3, level: error} + hyphens: {level: error} + indentation: disable + key-duplicates: enable + line-length: disable + new-line-at-end-of-file: disable + new-lines: {type: unix} + trailing-spaces: enable + truthy: disable diff --git a/include/loctevm-provide-iso.inc.yml b/include/loctevm-provide-iso.inc.yml index d5273b6..632a344 100644 --- a/include/loctevm-provide-iso.inc.yml +++ b/include/loctevm-provide-iso.inc.yml @@ -1,7 +1,7 @@ --- - name: retrieve install iso - get_url: + get_url: checksum: "sha1:23dde0f195170d9fbe99547f9df75838acc95b5e" dest: "{{ vm_path }}/debian-8.6.0-amd64-i386-netinst.iso" force: no @@ -24,7 +24,7 @@ loop_control: loop_var: lri_item delegate_to: 127.0.0.1 # local action - + - name: manual intervention 1 - extract configs debug: msg: | @@ -125,4 +125,3 @@ # remote_src: True # though remote equals local ... # delegate_to: 127.0.0.1 # local action # register: primcopy - diff --git a/playbooks/servers.yml b/playbooks/servers.yml index d5a05d0..5a45db1 100755 --- a/playbooks/servers.yml +++ b/playbooks/servers.yml @@ -2,6 +2,6 @@ - hosts: ff-servers remote_user: admin - roles: + roles: - prerequisites - ffmwu-server diff --git a/roles/ffmwu-meshing/tasks/fastd-config.yml b/roles/ffmwu-meshing/tasks/fastd-config.yml index d30e95a..2054e28 100644 --- a/roles/ffmwu-meshing/tasks/fastd-config.yml +++ b/roles/ffmwu-meshing/tasks/fastd-config.yml @@ -40,7 +40,7 @@ line: secret "{{f_key_pair.stdout_lines[0] |regex_replace('^Secret. ','')}}"; mode: 0400 regexp: '^secret ".*";' - state : present + state: present - name: write out fastd public key - {{mf_com.abbreviation}} lineinfile: @@ -50,7 +50,7 @@ line: key "{{f_key_pair.stdout_lines[1] |regex_replace('^Public. ','')}}"; mode: 0440 regexp: '^key ".*";' - state : present + state: present register: f_pub_key ignore_errors: True diff --git a/roles/server-repos/vars/main.yml b/roles/server-repos/vars/main.yml index 40a6cb1..5690253 100644 --- a/roles/server-repos/vars/main.yml +++ b/roles/server-repos/vars/main.yml @@ -9,4 +9,3 @@ repos: - name: freifunk repo: 'deb-src http://repo.freifunk-mwu.de/debian jessie main' update_cache: yes - diff --git a/roles/service-ntpd/tasks/main.yml b/roles/service-ntpd/tasks/main.yml index 072f0f8..907c8ae 100644 --- a/roles/service-ntpd/tasks/main.yml +++ b/roles/service-ntpd/tasks/main.yml @@ -26,4 +26,3 @@ state: started daemon_reload: yes become: true -