From b892f1d7262b36e2ba895768272779571c613adf Mon Sep 17 00:00:00 2001 From: Colin Wilk Date: Mon, 22 May 2023 23:32:53 +0200 Subject: Add YAMLLint rules Fix linting errors that came up with the new rules Main changes: * Enforce YAML document start headers * Enforce spacing with commas, colons and hyphens * Enforce indentation * Enforce use of quotes only then required * Enforce use of single quotes over double quotes * Enforce use of true/false over yes/no and derivatives * [..] Other minor rules that were already followed Signed-off-by: Colin Wilk --- molecule/default/converge.yml | 14 +++++++------- molecule/default/molecule.yml | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'molecule') diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index 9c23b5f..17b5f0e 100644 --- a/molecule/default/converge.yml +++ b/molecule/default/converge.yml @@ -19,15 +19,15 @@ - name: Set ssh_key ansible.builtin.set_fact: - borg_server_host_ssh_key: "{{ borg_server_ssh_keyscan.stdout - | split(' ') - | reject('search', borg_server_host) - | join(' ') }}" + borg_server_host_ssh_key: '{{ borg_server_ssh_keyscan.stdout + | split(" ") + | reject("search", borg_server_host) + | join(" ") }}' vars: borg_server_host: borg-server borg_server_user_home: /opt/borg - borg_decryption_keys_yaml_path: "{{ playbook_dir }}/decryption_keys.yml" + borg_decryption_keys_yaml_path: '{{ playbook_dir }}/decryption_keys.yml' borg_included_dirs: - /etc - /home @@ -36,8 +36,8 @@ - /var - /reee reeee borg_cron_time: - minute: "*" - hour: "*" + minute: '*' + hour: '*' roles: - role: kliwniloc.borgbackup diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index f37c640..3c0dfef 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -14,19 +14,19 @@ platforms: dockerfile: Dockerfile.j2 pre_build_image: false docker_networks: - - name: 'molecule-container-net' + - name: molecule-container-net driver_options: # Setting the mtu size due to issues with docker and VPN com.docker.network.driver.mtu: 1420 networks: - - name: 'molecule-container-net' + - name: molecule-container-net - name: borg-server image: ${MOLECULE_DISTRO_SERVER:-debian:10} dockerfile: Dockerfile.j2 pre_build_image: false networks: - - name: 'molecule-container-net' + - name: molecule-container-net provisioner: -- cgit v1.2.3