Merge 2bee1b5566 into 82bc12046b

Makefile

@@ -30,7 +30,10 @@ verify:
 	ansible-playbook playbooks/verify-homelab.yml
 
 venv:
-	source ./venv/bin/activate
+	# activate venv if it exists
+	if [ -d "./venv" ]; then \
+		source venv/bin/activate; \
+	fi
 
 deps: venv
 	pip install --upgrade pip

group_vars/docker.yml

@@ -1,4 +1,3 @@
----
 pip_install_packages:
 - name: docker
 

group_vars/servers.yml

@@ -34,6 +34,6 @@ desired_docker_images:
 - ubuntu:latest
 
 portainer_endpoint: -1
-portainer_base_url: "http://qnap:9000"
+portainer_base_url: http://qnap:9000
 external_docker_networks: []
 portainer_required_files: []

host_vars/qnap.yml

@@ -21,8 +21,8 @@ backup_directories:
 - path: /mnt/mergerfs/documents/media/documents/originals
   s3_name: paperless-docs
 
-cron_hour: "5"
+cron_hour: '5'
-docker_backup_host_backup_directory: "/tmp"
+docker_backup_host_backup_directory: /tmp
 
 devices:
 - uuid: a54c1bde-1400-4975-bf24-08c603ca3a11       # /dev/sdc1

host_vars/snunmu.yml

@@ -1,4 +1,3 @@
----
 vault_file: vault_vars/qnap-vault.yml
 
 portainer_required_templates:
@@ -22,12 +21,12 @@ services:
 ansible_pull_path: /usr/local/bin/ansible-pull
 
 backup_directories: []
-cron_hour: "4"
+cron_hour: '4'
 
 # docker options
 docker_daemon_options:
   hosts:
-    - "tcp://0.0.0.0:2375"
+  - tcp://0.0.0.0:2375
-    - "unix:///var/run/docker.sock"
+  - unix:///var/run/docker.sock
 
-docker_backup_host_backup_directory: "/tmp"
+docker_backup_host_backup_directory: /tmp

playbooks/backup-directories.yml

@@ -1,17 +1,16 @@
----
 - name: Backup Directories.
   hosts: servers
   become: true
 
   pre_tasks:
   - name: Include vault variables.
-      ansible.builtin.include_vars: '../{{ vault_file }}'
+    ansible.builtin.include_vars: ../{{ vault_file }}
     tags: [always]
 
   tasks:
   - name: Backup Directories.
     ansible.builtin.include_role:
       name: backup_directory
-      with_items: "{{ backup_directories }}"
+    with_items: '{{ backup_directories }}'
     loop_control:
       loop_var: backup

playbooks/restore-docker-volumes.yml

@@ -1,14 +1,13 @@
----
 - name: Restore a docker volume.
   hosts: servers
   become: true
   pre_tasks:
   - name: Include vault variables.
-    ansible.builtin.include_vars: '../{{ vault_file }}'
+    ansible.builtin.include_vars: ../{{ vault_file }}
     tags: [always]
   vars:
-    volume_name: ""
+    volume_name: ''
-    s3_key: ""
+    s3_key: ''
   roles:
   - role: chatton.docker_backup.docker_s3_volume_restore
     vars:
@@ -16,5 +15,5 @@
       docker_backup_restore_latest_s3_key: "{{ volume_name != '' | bool }}"
       docker_backup_fail_on_no_s3_backups: true
       docker_backup_s3_volume:
-          name: "{{ volume_name }}"
+        name: '{{ volume_name }}'
-          s3_key: "{{ s3_key }}"
+        s3_key: '{{ s3_key }}'

playbooks/setup-homelab.yml

@@ -1,4 +1,3 @@
----
 - name: Update packages and ensure users on all hosts.
   hosts: all
   become: true
@@ -37,13 +36,13 @@
   become: true
   pre_tasks:
   - name: Include vault variables.
-      ansible.builtin.include_vars: '../{{ vault_file }}'
+    ansible.builtin.include_vars: ../{{ vault_file }}
     tags: [always]
   roles:
   - role: setup_portainer
     tags: [services, portainer]
     vars:
-        portainer_version: "2.18.3"
+      portainer_version: 2.18.3
 
 
 - name: Setup and deploy services.
@@ -51,7 +50,7 @@
   become: true
   pre_tasks:
   - name: Include vault variables.
-      ansible.builtin.include_vars: '../{{ vault_file }}'
+    ansible.builtin.include_vars: ../{{ vault_file }}
     tags: [always]
   roles:
   - role: setup_hosted_services

playbooks/setup-linode.yml

@@ -1,4 +1,3 @@
----
 - name: Setup linode instance.
   hosts: localhost
   become: true

playbooks/verify-homelab.yml

@@ -1,4 +1,3 @@
----
 - name: Verify HomeLab has been correctly set up.
   hosts: all
   become: true
@@ -9,7 +8,8 @@
     - always
   tasks:
   - name: Docker Compose Files Exist
-      ansible.builtin.command: stat {{ directories.docker_compose_directory }}/{{ item.name }}/docker-compose.yml
+    ansible.builtin.command: stat {{ directories.docker_compose_directory }}/{{ item.name
+      }}/docker-compose.yml
     with_items: '{{ services }}'
     changed_when: false
     register: docker_compose_stat
@@ -32,7 +32,8 @@
     register: image_details
   - name: Assert desired images exist
     ansible.builtin.assert:
-        that: "{{ item in image_details.images | map(attribute='RepoTags') | flatten }}"
+      that: "{{ item in image_details.images | map(attribute='RepoTags') | flatten\
+        \ }}"
     with_items: '{{ desired_docker_images }}'
 
   - name: Fetch Sudoers Files

roles/backup_directory/meta/main.yml

@@ -1,10 +1,9 @@
----
 galaxy_info:
   author: Cian Hatton
   namespace: chatton
   description: Backup directories
   license: MIT
-  min_ansible_version: "2.1"
+  min_ansible_version: '2.1'
   galaxy_tags: []
   platforms:
   - name: Debian

roles/backup_directory/tasks/main.yml

@@ -1,24 +1,23 @@
----
 - name: Determine backup timestamp.
   ansible.builtin.set_fact: backup_time="{{ ansible_date_time.iso8601 }}"
 
 - name: Compress Directory
   community.general.archive:
-    path: "{{ backup.path }}"
+    path: '{{ backup.path }}'
     dest: /tmp/backup.tar.gz
-    mode: "0755"
+    mode: '0755'
 
 - name: Upload backups to S3
   amazon.aws.aws_s3:
-    s3_url: "{{ docker_backup_aws_s3_url }}"
+    s3_url: '{{ docker_backup_aws_s3_url }}'
-    bucket: "{{ docker_backup_aws_s3_bucket }}"
+    bucket: '{{ docker_backup_aws_s3_bucket }}'
-    object: "{{ backup.s3_name }}-{{ backup_time }}.tar.gz"
+    object: '{{ backup.s3_name }}-{{ backup_time }}.tar.gz'
     src: /tmp/backup.tar.gz
-    aws_access_key: "{{ docker_backup_aws_s3_aws_access_key }}"
+    aws_access_key: '{{ docker_backup_aws_s3_aws_access_key }}'
-    aws_secret_key: "{{ docker_backup_aws_s3_aws_secret_key }}"
+    aws_secret_key: '{{ docker_backup_aws_s3_aws_secret_key }}'
-    region: "{{ docker_backup_aws_s3_region }}"
+    region: '{{ docker_backup_aws_s3_region }}'
     mode: put
-    permission: "{{ docker_backup_aws_s3_permissions }}"
+    permission: '{{ docker_backup_aws_s3_permissions }}'
 
 - name: Remove local backup.
   ansible.builtin.file:

roles/bootstrap/meta/main.yml

@@ -3,7 +3,7 @@ galaxy_info:
   namespace: chatton
   description: Bootstrap ansible
   license: MIT
-  min_ansible_version: "2.1"
+  min_ansible_version: '2.1'
   galaxy_tags: []
   platforms:
   - name: Debian

roles/bootstrap/tasks/main.yml

@@ -1,4 +1,3 @@
----
 - name: Add sources list
   ansible.builtin.copy:
     src: sources_list
@@ -27,7 +26,7 @@
 - name: Add sudoers files
   ansible.builtin.template:
     src: sudoer_file
-    dest: "/etc/sudoers.d/{{ item }}"
+    dest: /etc/sudoers.d/{{ item }}
     owner: root
     group: root
     mode: 0440

roles/deploy_portainer_stack/defaults/main.yml

@@ -1,7 +1,6 @@
----
 # defaults file for chatton.deploy_portainer_stack
 
-portainer_stack_name: ""
+portainer_stack_name: ''
 # required directories for this stack
 portainer_stack_directories: []
 

roles/deploy_portainer_stack/meta/main.yml

@@ -3,7 +3,7 @@ galaxy_info:
   namespace: chatton
   description: Deploy a single portainer stack.
   license: MIT
-  min_ansible_version: "2.1"
+  min_ansible_version: '2.1'
   galaxy_tags: []
   platforms:
   - name: Debian

roles/deploy_portainer_stack/tasks/main.yml

@@ -1,11 +1,10 @@
----
+- name: Stack {{ portainer_stack_name }} | Create a directory if it does not exist
-- name: "Stack {{ portainer_stack_name }} | Create a directory if it does not exist"
   ansible.builtin.file:
     path: '{{ directories.docker_compose_directory }}/{{ portainer_stack_name }}'
     state: directory
     mode: '0755'
 
-- name: "Stack {{ portainer_stack_name }} | Template Docker Compose File"
+- name: Stack {{ portainer_stack_name }} | Template Docker Compose File
   ansible.builtin.template:
     src: '{{ portainer_stack_name }}.j2'
     dest: '{{ directories.docker_compose_directory }}/{{ portainer_stack_name }}/docker-compose.yml'
@@ -13,24 +12,25 @@
     group: root
     mode: 0440
   vars:
-    template_vars: "{{ portainer_stack_template_vars }}"
+    template_vars: '{{ portainer_stack_template_vars }}'
 
-- name: "Stack {{ portainer_stack_name }} | Ensure required directories"
+- name: Stack {{ portainer_stack_name }} | Ensure required directories
   ansible.builtin.file:
     path: '{{ item }}'
     state: directory
     mode: '0755'
-  with_items: "{{ portainer_stack_directories }}"
+  with_items: '{{ portainer_stack_directories }}'
 
-- name: "Stack {{ portainer_stack_name }} | Find docker volumes"
+- name: Stack {{ portainer_stack_name }} | Find docker volumes
-  ansible.builtin.shell: docker volume ls -f name={{ portainer_stack_name }} --format '{{ '{{' }}  .Name {{ '}}' }}'
+  ansible.builtin.shell: docker volume ls -f name={{ portainer_stack_name }} --format
+    '{{ '{{' }}  .Name {{ '}}' }}'
   register: find_volumes
   changed_when: false
 
-- name: "Stack {{ portainer_stack_name }} | Find docker volumes that need to be restored"
+- name: Stack {{ portainer_stack_name }} | Find docker volumes that need to be restored
   ansible.builtin.script: scripts/find-volumes-to-restore.py
   environment:
-    EXISTING_VOLUMES: "{{ find_volumes.stdout_lines }}"
+    EXISTING_VOLUMES: '{{ find_volumes.stdout_lines }}'
     STACK_NAME: '{{ portainer_stack_name }}'
     DOCKER_COMPOSE_DIR: '{{ directories.docker_compose_directory }}'
   args:
@@ -38,12 +38,12 @@
   register: python_output
   changed_when: false
 
-- name: "Stack {{ portainer_stack_name }} | Build list of volumes to restore."
+- name: Stack {{ portainer_stack_name }} | Build list of volumes to restore.
   ansible.builtin.set_fact:
     restore_volumes: "{{ restore_volumes | default([]) + [{'name':item}] }}"
-  with_items: "{{ python_output.stdout_lines | list }}"
+  with_items: '{{ python_output.stdout_lines | list }}'
 
-- name: "Stack {{ portainer_stack_name }} | Restore any missing volumes from S3"
+- name: Stack {{ portainer_stack_name }} | Restore any missing volumes from S3
   ansible.builtin.include_role:
     name: chatton.docker_backup.docker_s3_volume_restore
   when: restore_volumes is defined
@@ -51,17 +51,18 @@
     docker_backup_restore_force: false
     docker_backup_restore_latest_s3_key: true
     docker_backup_fail_on_no_s3_backups: false
-    docker_backup_s3_volume: "{{ volume }}"
+    docker_backup_s3_volume: '{{ volume }}'
-  with_items: "{{ restore_volumes }}"
+  with_items: '{{ restore_volumes }}'
   loop_control:
     loop_var: volume
 
-- name: "Stack {{ portainer_stack_name }} | Update Portainer."
+- name: Stack {{ portainer_stack_name }} | Update Portainer.
   chatton.portainer.portainer_stack:
     username: admin
     password: '{{ portainer.password }}'
     base_url: '{{ portainer_base_url }}'
-    docker_compose_file_path: '{{ directories.docker_compose_directory }}/{{ portainer_stack_name }}/docker-compose.yml'
+    docker_compose_file_path: '{{ directories.docker_compose_directory }}/{{ portainer_stack_name
+      }}/docker-compose.yml'
     stack_name: '{{ portainer_stack_name }}'
     endpoint_id: '{{ portainer_stack_endpoint_id }}'
     state: present

roles/docker_restore_container/defaults/main.yml

@@ -1,2 +1,2 @@
----
+null
-# defaults file for chatton.docker_restore
+...

roles/docker_restore_container/handlers/main.yml

@@ -1,2 +1,2 @@
----
+null
-# handlers file for chatton.docker_restore
+...

roles/docker_restore_container/tasks/main.yml

@@ -1,121 +1,124 @@
----
 # tasks file for chatton.docker_backup
 # https://docs.ansible.com/ansible/latest/collections/community/docker/docker_container_module.html#ansible-collections-community-docker-docker-container-module
 # https://docs.docker.com/storage/volumes/#backup-restore-or-migrate-data-volumes
 
 - name: Get container details
   docker_container_info:
-    name: "{{ container_restore }}"
+    name: '{{ container_restore }}'
   register: result
 
 - name: Fail if container is not present
   fail:
-    msg: Cannot restore volumes for a container when it does not exist. Ensure the container exists and try again.
+    msg: Cannot restore volumes for a container when it does not exist. Ensure the
+      container exists and try again.
   when: result.exists == false
 
 - debug: msg="{{ result }}"
 
 - name: Extract only the volume mounts (not bind mounts)
-  set_fact: volume_mounts="{{ result.container.Mounts | selectattr("Type", "equalto", "volume")}}"
+  set_fact: volume_mounts="{{ result.container.Mounts | selectattr("Type", "equalto",
+    "volume")}}"
 
 - debug: msg="{{ volume_mounts }}"
 
 - name: Find relevant volume(s) in S3
   amazon.aws.aws_s3:
-    bucket: "{{ aws_s3.bucket }}"
+    bucket: '{{ aws_s3.bucket }}'
     mode: list
-    region: "{{ aws_s3.region }}"
+    region: '{{ aws_s3.region }}'
-    s3_url: "https://{{ aws_s3.s3_url }}"
+    s3_url: https://{{ aws_s3.s3_url }}
-    prefix: "{{ item.Name }}/{{ item.Name }}"
+    prefix: '{{ item.Name }}/{{ item.Name }}'
-    aws_access_key: "{{ aws_s3.aws_access_key }}"
+    aws_access_key: '{{ aws_s3.aws_access_key }}'
-    aws_secret_key: "{{ aws_s3.aws_secret_key }}"
+    aws_secret_key: '{{ aws_s3.aws_secret_key }}'
   register: s3_list_output
-  with_items: "{{ volume_mounts }}"
+  with_items: '{{ volume_mounts }}'
 
 - debug: msg="{{ s3_list_output }}"
 
 - name: Extract s3 keys for container
-  set_fact: container_s3_keys="{{ container_s3_keys | default([]) + [item.s3_keys | last] }}"
+  set_fact: container_s3_keys="{{ container_s3_keys | default([]) + [item.s3_keys
-  with_items: "{{ s3_list_output.results }}"
+    | last] }}"
+  with_items: '{{ s3_list_output.results }}'
 
 - debug: msg="{{ container_s3_keys }}"
 
 - name: Create a directory for temporary backups if they do not exist
   ansible.builtin.file:
-    path: "/tmp/{{ item.Name }}"
+    path: /tmp/{{ item.Name }}
     state: directory
     mode: '0755'
-  with_items: "{{ volume_mounts }}"
+  with_items: '{{ volume_mounts }}'
 
 - name: Download archives from S3
   amazon.aws.aws_s3:
-    bucket: "{{ aws_s3.bucket }}"
+    bucket: '{{ aws_s3.bucket }}'
-    object: "{{ item }}"
+    object: '{{ item }}'
-    aws_access_key: "{{ aws_s3.aws_access_key }}"
+    aws_access_key: '{{ aws_s3.aws_access_key }}'
-    aws_secret_key: "{{ aws_s3.aws_secret_key }}"
+    aws_secret_key: '{{ aws_s3.aws_secret_key }}'
-    region: "{{ aws_s3.region }}"
+    region: '{{ aws_s3.region }}'
-    s3_url: "https://{{ aws_s3.s3_url }}"
+    s3_url: https://{{ aws_s3.s3_url }}
     mode: get
-    dest: "/tmp/{{ item }}"
+    dest: /tmp/{{ item }}
-  with_items: "{{ container_s3_keys }}"
+  with_items: '{{ container_s3_keys }}'
   register: get_out
 
 - debug: msg="{{ get_out }}"
 
 - set_fact:
-    volume_details: "{{ volume_details | default([]) + [ {'mount': item.0, 's3_key': item.1} ] }}"
+    volume_details: "{{ volume_details | default([]) + [ {'mount': item.0, 's3_key':\
+      \ item.1} ] }}"
   with_together:
-    - "{{ volume_mounts }}"
+  - '{{ volume_mounts }}'
-    - "{{ container_s3_keys }}"
+  - '{{ container_s3_keys }}'
 
 - debug: msg="{{ volume_details }}"
 
 - name: Stop a container
   community.docker.docker_container:
-    name: "{{ container_restore }}"
+    name: '{{ container_restore }}'
     state: stopped
 
 - name: Ensure Volume
   docker_volume:
-    name: "{{ item.mount.Name }}"
+    name: '{{ item.mount.Name }}'
     state: present
-  with_items: "{{ volume_details }}"
+  with_items: '{{ volume_details }}'
 
 - name: Remove contents of volumes
   community.docker.docker_container:
-    name: "restore-container-{{ item.mount.Name }}-{{ 10 | random }}"
+    name: restore-container-{{ item.mount.Name }}-{{ 10 | random }}
     image: ubuntu
-    command: "rm -rf ./* "
+    command: 'rm -rf ./* '
     auto_remove: true
     detach: false # block until this container exists.
     state: started
     # start inside the directory we want to wipe
-    working_dir: "{{ item.mount.Destination }}"
+    working_dir: '{{ item.mount.Destination }}'
     volumes:
     - /tmp:/tmp
     volumes_from:
-      - "{{ container_restore }}"
+    - '{{ container_restore }}'
-  with_items: "{{ volume_details }}"
+  with_items: '{{ volume_details }}'
 
 
 - name: Restore contents of volumes
   community.docker.docker_container:
-    name: "restore-container-{{ item.mount.Name }}-{{ 10 | random }}"
+    name: restore-container-{{ item.mount.Name }}-{{ 10 | random }}
     image: ubuntu
     # extract the tar into the volume.
-    command: "tar xvf /tmp/{{ item.s3_key }}"
+    command: tar xvf /tmp/{{ item.s3_key }}
     auto_remove: true
     detach: false # block until this container exists.
     state: started
     # the compressed volume contains the directories, so we start from the root
-    working_dir: "/"
+    working_dir: /
     volumes:
     - /tmp:/tmp
     volumes_from:
-      - "{{ container_restore }}"
+    - '{{ container_restore }}'
-  with_items: "{{ volume_details }}"
+  with_items: '{{ volume_details }}'
 
 - name: Start a container
   community.docker.docker_container:
-    name: "{{ container_restore }}"
+    name: '{{ container_restore }}'
     state: started

roles/docker_restore_container/vars/main.yml

@@ -1,2 +1,2 @@
----
+null
-# vars file for chatton.docker_restore
+...

roles/geerlingguy.docker/.github/FUNDING.yml

@@ -1,4 +1,2 @@
-# These are supported funding model platforms
----
 github: geerlingguy
 patreon: geerlingguy

roles/geerlingguy.docker/.github/stale.yml

@@ -1,5 +1,3 @@
-# Configuration for probot-stale - https://github.com/probot/stale
----
 # Number of days of inactivity before an Issue or Pull Request becomes stale
 daysUntilStale: 90
 
@@ -42,7 +40,8 @@ pulls:
     This pull request is no longer marked for closure.
 
   closeComment: >-
-    This pull request has been closed due to inactivity. If you feel this is in error, please reopen the pull request or file a new PR with the relevant details.
+    This pull request has been closed due to inactivity. If you feel this is in error,
+    please reopen the pull request or file a new PR with the relevant details.
 
 issues:
   markComment: |-
@@ -54,4 +53,5 @@ issues:
     This issue is no longer marked for closure.
 
   closeComment: >-
-    This issue has been closed due to inactivity. If you feel this is in error, please reopen the issue or file a new issue with the relevant details.
+    This issue has been closed due to inactivity. If you feel this is in error, please
+    reopen the issue or file a new issue with the relevant details.

roles/geerlingguy.docker/.github/workflows/ci.yml

@@ -1,16 +1,15 @@
----
 name: CI
-'on':
+on:
   pull_request:
   push:
     branches:
     - master
   schedule:
-    - cron: "0 7 * * 0"
+  - cron: 0 7 * * 0
 
 defaults:
   run:
-    working-directory: 'geerlingguy.docker'
+    working-directory: geerlingguy.docker
 
 jobs:
 
@@ -21,12 +20,12 @@ jobs:
     - name: Check out the codebase.
       uses: actions/checkout@v2
       with:
-          path: 'geerlingguy.docker'
+        path: geerlingguy.docker
 
     - name: Set up Python 3.
       uses: actions/setup-python@v2
       with:
-          python-version: '3.x'
+        python-version: 3.x
 
     - name: Install test dependencies.
       run: pip3 install yamllint
@@ -54,12 +53,12 @@ jobs:
     - name: Check out the codebase.
       uses: actions/checkout@v2
       with:
-          path: 'geerlingguy.docker'
+        path: geerlingguy.docker
 
     - name: Set up Python 3.
       uses: actions/setup-python@v2
       with:
-          python-version: '3.x'
+        python-version: 3.x
 
     - name: Install test dependencies.
       run: pip3 install ansible molecule[docker] docker

roles/geerlingguy.docker/.github/workflows/release.yml

@@ -1,4 +1,3 @@
----
 # This workflow requires a GALAXY_API_KEY secret present in the GitHub
 # repository or organization.
 #
@@ -6,14 +5,14 @@
 # See: https://github.com/ansible/galaxy/issues/46
 
 name: Release
-'on':
+on:
   push:
     tags:
     - '*'
 
 defaults:
   run:
-    working-directory: 'geerlingguy.docker'
+    working-directory: geerlingguy.docker
 
 jobs:
 
@@ -24,12 +23,12 @@ jobs:
     - name: Check out the codebase.
       uses: actions/checkout@v2
       with:
-          path: 'geerlingguy.docker'
+        path: geerlingguy.docker
 
     - name: Set up Python 3.
       uses: actions/setup-python@v2
       with:
-          python-version: '3.x'
+        python-version: 3.x
 
     - name: Install Ansible.
       run: pip3 install ansible-core
@@ -37,4 +36,5 @@ jobs:
     - name: Trigger a new import on Galaxy.
       run: >-
         ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }}
-          $(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository }} | cut -d/ -f2)
+        $(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository
+        }} | cut -d/ -f2)

roles/geerlingguy.docker/defaults/main.yml

@@ -1,11 +1,10 @@
----
 # Edition can be one of: 'ce' (Community Edition) or 'ee' (Enterprise Edition).
-docker_edition: 'ce'
+docker_edition: ce
 docker_packages:
-  - "docker-{{ docker_edition }}"
+- docker-{{ docker_edition }}
-  - "docker-{{ docker_edition }}-cli"
+- docker-{{ docker_edition }}-cli
-  - "docker-{{ docker_edition }}-rootless-extras"
+- docker-{{ docker_edition }}-rootless-extras
-  - "containerd.io"
+- containerd.io
 docker_packages_state: present
 
 # Service options.
@@ -21,9 +20,10 @@ docker_compose_package_state: present
 
 # Docker Compose options.
 docker_install_compose: true
-docker_compose_version: "v2.4.1"
+docker_compose_version: v2.4.1
 docker_compose_arch: x86_64
-docker_compose_url: "https://github.com/docker/compose/releases/download/{{ docker_compose_version }}/docker-compose-linux-{{ docker_compose_arch }}"
+docker_compose_url: https://github.com/docker/compose/releases/download/{{ docker_compose_version
+  }}/docker-compose-linux-{{ docker_compose_arch }}
 docker_compose_path: /usr/local/bin/docker-compose
 
 # Docker repo URL.
@@ -32,15 +32,17 @@ docker_repo_url: https://download.docker.com/linux
 # Used only for Debian/Ubuntu. Switch 'stable' to 'nightly' if needed.
 docker_apt_release_channel: stable
 docker_apt_arch: amd64
-docker_apt_repository: "deb [arch={{ docker_apt_arch }}] {{ docker_repo_url }}/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}"
+docker_apt_repository: deb [arch={{ docker_apt_arch }}] {{ docker_repo_url }}/{{ ansible_distribution
+  | lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}
 docker_apt_ignore_key_error: true
-docker_apt_gpg_key: "{{ docker_repo_url }}/{{ ansible_distribution | lower }}/gpg"
+docker_apt_gpg_key: '{{ docker_repo_url }}/{{ ansible_distribution | lower }}/gpg'
 
 # Used only for RedHat/CentOS/Fedora.
-docker_yum_repo_url: "{{ docker_repo_url }}/{{ (ansible_distribution == 'Fedora') | ternary('fedora','centos') }}/docker-{{ docker_edition }}.repo"
+docker_yum_repo_url: "{{ docker_repo_url }}/{{ (ansible_distribution == 'Fedora')\
+  \ | ternary('fedora','centos') }}/docker-{{ docker_edition }}.repo"
 docker_yum_repo_enable_nightly: '0'
 docker_yum_repo_enable_test: '0'
-docker_yum_gpg_key: "{{ docker_repo_url }}/centos/gpg"
+docker_yum_gpg_key: '{{ docker_repo_url }}/centos/gpg'
 
 # A list of users who will be added to the docker group.
 docker_users: []

roles/geerlingguy.docker/handlers/main.yml

@@ -1,7 +1,6 @@
----
 - name: restart docker
   service:
     name: docker
-    state: "{{ docker_restart_handler_state }}"
+    state: '{{ docker_restart_handler_state }}'
-  ignore_errors: "{{ ansible_check_mode }}"
+  ignore_errors: '{{ ansible_check_mode }}'
   when: docker_service_manage | bool

roles/geerlingguy.docker/meta/main.yml

@@ -1,12 +1,11 @@
----
 dependencies: []
 
 galaxy_info:
   role_name: docker
   author: geerlingguy
   description: Docker for Linux.
-  company: "Midwestern Mac, LLC"
+  company: Midwestern Mac, LLC
-  license: "license (BSD, MIT)"
+  license: license (BSD, MIT)
   min_ansible_version: 2.4
   platforms:
   - name: EL

roles/geerlingguy.docker/molecule/default/converge.yml

@@ -1,4 +1,3 @@
----
 - name: Converge
   hosts: all
   become: true

roles/geerlingguy.docker/molecule/default/molecule.yml

@@ -1,4 +1,3 @@
----
 role_name_check: 1
 dependency:
   name: galaxy
@@ -6,7 +5,7 @@ driver:
   name: docker
 platforms:
 - name: instance
-    image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
+  image: geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest
   command: ${MOLECULE_DOCKER_COMMAND:-""}
   volumes:
   - /sys/fs/cgroup:/sys/fs/cgroup:ro

roles/geerlingguy.docker/tasks/docker-compose.yml

@@ -1,18 +1,18 @@
----
 - name: Check current docker-compose version.
-  command: "{{ docker_compose_path }} --version"
+  command: '{{ docker_compose_path }} --version'
   register: docker_compose_vsn
   check_mode: false
   changed_when: false
   failed_when: false
 
 - set_fact:
-    docker_compose_current_version: "{{ docker_compose_vsn.stdout | regex_search('(\\d+(\\.\\d+)+)') }}"
+    docker_compose_current_version: "{{ docker_compose_vsn.stdout | regex_search('(\\\
+      d+(\\.\\d+)+)') }}"
   when: docker_compose_vsn.stdout is defined
 
 - name: Delete existing docker-compose version if it's different.
   file:
-    path: "{{ docker_compose_path }}"
+    path: '{{ docker_compose_path }}'
     state: absent
   when: >
     docker_compose_current_version is defined
@@ -20,10 +20,11 @@
 
 - name: Install Docker Compose (if configured).
   get_url:
-    url: "{{ docker_compose_url }}"
+    url: '{{ docker_compose_url }}'
-    dest: "{{ docker_compose_path }}"
+    dest: '{{ docker_compose_path }}'
     mode: 0755
   when: >
     (docker_compose_current_version is not defined)
     or (docker_compose_current_version|length == 0)
-    or (docker_compose_current_version is version((docker_compose_version | regex_replace('v', '')), '<'))
+    or (docker_compose_current_version is version((docker_compose_version | regex_replace('v',
+    '')), '<'))

roles/geerlingguy.docker/tasks/docker-users.yml

@@ -1,10 +1,9 @@
----
 - name: Ensure docker users are added to the docker group.
   user:
-    name: "{{ item }}"
+    name: '{{ item }}'
     groups: docker
     append: true
-  with_items: "{{ docker_users }}"
+  with_items: '{{ docker_users }}'
 
 - name: Reset ssh connection to apply user changes.
   meta: reset_connection

roles/geerlingguy.docker/tasks/main.yml

@@ -1,4 +1,3 @@
----
 - name: Load OS-specific vars.
   include_vars: "{{ lookup('first_found', params) }}"
   vars:
@@ -8,7 +7,7 @@
       - '{{ansible_os_family}}.yml'
       - main.yml
       paths:
-        - 'vars'
+      - vars
 
 - include_tasks: setup-RedHat.yml
   when: ansible_os_family == 'RedHat'
@@ -18,37 +17,41 @@
 
 - name: Install Docker packages.
   package:
-    name: "{{ docker_packages }}"
+    name: '{{ docker_packages }}'
-    state: "{{ docker_packages_state }}"
+    state: '{{ docker_packages_state }}'
   notify: restart docker
-  ignore_errors: "{{ ansible_check_mode }}"
+  ignore_errors: '{{ ansible_check_mode }}'
-  when: "ansible_version.full is version_compare('2.12', '<') or ansible_os_family not in ['RedHat', 'Debian']"
+  when: ansible_version.full is version_compare('2.12', '<') or ansible_os_family
+    not in ['RedHat', 'Debian']
 
 - name: Install Docker packages (with downgrade option).
   package:
-    name: "{{ docker_packages }}"
+    name: '{{ docker_packages }}'
-    state: "{{ docker_packages_state }}"
+    state: '{{ docker_packages_state }}'
     allow_downgrade: true
   notify: restart docker
-  ignore_errors: "{{ ansible_check_mode }}"
+  ignore_errors: '{{ ansible_check_mode }}'
-  when: "ansible_version.full is version_compare('2.12', '>=') and ansible_os_family in ['RedHat', 'Debian']"
+  when: ansible_version.full is version_compare('2.12', '>=') and ansible_os_family
+    in ['RedHat', 'Debian']
 
 - name: Install docker-compose plugin.
   package:
-    name: "{{ docker_compose_package }}"
+    name: '{{ docker_compose_package }}'
-    state: "{{ docker_compose_package_state }}"
+    state: '{{ docker_compose_package_state }}'
   notify: restart docker
-  ignore_errors: "{{ ansible_check_mode }}"
+  ignore_errors: '{{ ansible_check_mode }}'
-  when: "docker_install_compose_plugin | bool == true and (ansible_version.full is version_compare('2.12', '<') or ansible_os_family not in ['RedHat', 'Debian'])"
+  when: docker_install_compose_plugin | bool == true and (ansible_version.full is
+    version_compare('2.12', '<') or ansible_os_family not in ['RedHat', 'Debian'])
 
 - name: Install docker-compose-plugin (with downgrade option).
   package:
-    name: "{{ docker_compose_package }}"
+    name: '{{ docker_compose_package }}'
-    state: "{{ docker_compose_package_state }}"
+    state: '{{ docker_compose_package_state }}'
     allow_downgrade: true
   notify: restart docker
-  ignore_errors: "{{ ansible_check_mode }}"
+  ignore_errors: '{{ ansible_check_mode }}'
-  when: "docker_install_compose_plugin | bool == true and ansible_version.full is version_compare('2.12', '>=') and ansible_os_family in ['RedHat', 'Debian']"
+  when: docker_install_compose_plugin | bool == true and ansible_version.full is version_compare('2.12',
+    '>=') and ansible_os_family in ['RedHat', 'Debian']
 
 - name: Ensure /etc/docker/ directory exists.
   file:
@@ -59,7 +62,7 @@
 
 - name: Configure Docker daemon options.
   copy:
-    content: "{{ docker_daemon_options | to_nice_json }}"
+    content: '{{ docker_daemon_options | to_nice_json }}'
     dest: /etc/docker/daemon.json
     mode: 0644
   when: docker_daemon_options.keys() | length > 0
@@ -68,9 +71,9 @@
 - name: Ensure Docker is started and enabled at boot.
   service:
     name: docker
-    state: "{{ docker_service_state }}"
+    state: '{{ docker_service_state }}'
-    enabled: "{{ docker_service_enabled }}"
+    enabled: '{{ docker_service_enabled }}'
-  ignore_errors: "{{ ansible_check_mode }}"
+  ignore_errors: '{{ ansible_check_mode }}'
   when: docker_service_manage | bool
 
 - name: Ensure handlers are notified now to avoid firewall conflicts.
@@ -92,7 +95,7 @@
   when:
   - docker_users | length > 0
   - item not in ansible_facts.getent_group["docker"][2]
-  with_items: "{{ docker_users }}"
+  with_items: '{{ docker_users }}'
 
 - include_tasks: docker-users.yml
   when: at_least_one_user_to_modify is defined

roles/geerlingguy.docker/tasks/setup-Debian.yml

@@ -1,4 +1,3 @@
----
 - name: Ensure old versions of Docker are not installed.
   package:
     name:
@@ -13,25 +12,28 @@
     - ca-certificates
     state: present
 
-- name: Ensure additional dependencies are installed (on Ubuntu < 20.04 and any other systems).
+- name: Ensure additional dependencies are installed (on Ubuntu < 20.04 and any other
+    systems).
   apt:
     name: gnupg2
     state: present
-  when: ansible_distribution != 'Ubuntu' or ansible_distribution_version is version('20.04', '<')
+  when: ansible_distribution != 'Ubuntu' or ansible_distribution_version is version('20.04',
+    '<')
 
 - name: Ensure additional dependencies are installed (on Ubuntu >= 20.04).
   apt:
     name: gnupg
     state: present
-  when: ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('20.04', '>=')
+  when: ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('20.04',
+    '>=')
 
 - name: Add Docker apt key.
   apt_key:
-    url: "{{ docker_apt_gpg_key }}"
+    url: '{{ docker_apt_gpg_key }}'
     id: 9DC858229FC7DD38854AE2D88D81803C0EBFCD88
     state: present
   register: add_repository_key
-  ignore_errors: "{{ docker_apt_ignore_key_error }}"
+  ignore_errors: '{{ docker_apt_ignore_key_error }}'
 
 - name: Ensure curl is present (on older systems without SNI).
   package: name=curl state=present
@@ -46,6 +48,6 @@
 
 - name: Add Docker repository.
   apt_repository:
-    repo: "{{ docker_apt_repository }}"
+    repo: '{{ docker_apt_repository }}'
     state: present
     update_cache: true

roles/geerlingguy.docker/tasks/setup-RedHat.yml

@@ -1,4 +1,3 @@
----
 - name: Ensure old versions of Docker are not installed.
   package:
     name:
@@ -9,21 +8,21 @@
 
 - name: Add Docker GPG key.
   rpm_key:
-    key: "{{ docker_yum_gpg_key }}"
+    key: '{{ docker_yum_gpg_key }}'
     state: present
 
 - name: Add Docker repository.
   get_url:
-    url: "{{ docker_yum_repo_url }}"
+    url: '{{ docker_yum_repo_url }}'
-    dest: '/etc/yum.repos.d/docker-{{ docker_edition }}.repo'
+    dest: /etc/yum.repos.d/docker-{{ docker_edition }}.repo
     owner: root
     group: root
     mode: 0644
 
 - name: Configure Docker Nightly repo.
   ini_file:
-    dest: '/etc/yum.repos.d/docker-{{ docker_edition }}.repo'
+    dest: /etc/yum.repos.d/docker-{{ docker_edition }}.repo
-    section: 'docker-{{ docker_edition }}-nightly'
+    section: docker-{{ docker_edition }}-nightly
     option: enabled
     value: '{{ docker_yum_repo_enable_nightly }}'
     mode: 0644
@@ -31,8 +30,8 @@
 
 - name: Configure Docker Test repo.
   ini_file:
-    dest: '/etc/yum.repos.d/docker-{{ docker_edition }}.repo'
+    dest: /etc/yum.repos.d/docker-{{ docker_edition }}.repo
-    section: 'docker-{{ docker_edition }}-test'
+    section: docker-{{ docker_edition }}-test
     option: enabled
     value: '{{ docker_yum_repo_enable_test }}'
     mode: 0644

roles/geerlingguy.docker/vars/Alpine.yml

@@ -1,2 +1 @@
----
+docker_package: docker
-docker_package: "docker"

roles/geerlingguy.docker/vars/main.yml

@@ -1,2 +1,2 @@
----
+null
-# Empty file
+...

roles/geerlingguy.pip/.github/FUNDING.yml

@@ -1,4 +1,2 @@
-# These are supported funding model platforms
----
 github: geerlingguy
 patreon: geerlingguy

roles/geerlingguy.pip/.github/stale.yml

@@ -42,7 +42,8 @@ pulls:
     This pull request is no longer marked for closure.
 
   closeComment: >-
-    This pull request has been closed due to inactivity. If you feel this is in error, please reopen the pull request or file a new PR with the relevant details.
+    This pull request has been closed due to inactivity. If you feel this is in error,
+    please reopen the pull request or file a new PR with the relevant details.
 
 issues:
   markComment: |-
@@ -54,4 +55,5 @@ issues:
     This issue is no longer marked for closure.
 
   closeComment: >-
-    This issue has been closed due to inactivity. If you feel this is in error, please reopen the issue or file a new issue with the relevant details.
+    This issue has been closed due to inactivity. If you feel this is in error, please
+    reopen the issue or file a new issue with the relevant details.

roles/geerlingguy.pip/.github/workflows/ci.yml

@@ -1,16 +1,15 @@
----
 name: CI
-'on':
+on:
   pull_request:
   push:
     branches:
     - master
   schedule:
-    - cron: "0 4 * * 5"
+  - cron: 0 4 * * 5
 
 defaults:
   run:
-    working-directory: 'geerlingguy.pip'
+    working-directory: geerlingguy.pip
 
 jobs:
 
@@ -21,12 +20,12 @@ jobs:
     - name: Check out the codebase.
       uses: actions/checkout@v2
       with:
-          path: 'geerlingguy.pip'
+        path: geerlingguy.pip
 
     - name: Set up Python 3.
       uses: actions/setup-python@v2
       with:
-          python-version: '3.x'
+        python-version: 3.x
 
     - name: Install test dependencies.
       run: pip3 install yamllint
@@ -51,12 +50,12 @@ jobs:
     - name: Check out the codebase.
       uses: actions/checkout@v2
       with:
-          path: 'geerlingguy.pip'
+        path: geerlingguy.pip
 
     - name: Set up Python 3.
       uses: actions/setup-python@v2
       with:
-          python-version: '3.x'
+        python-version: 3.x
 
     - name: Install test dependencies.
       run: pip3 install ansible molecule[docker] docker

roles/geerlingguy.pip/.github/workflows/release.yml

@@ -1,4 +1,3 @@
----
 # This workflow requires a GALAXY_API_KEY secret present in the GitHub
 # repository or organization.
 #
@@ -6,14 +5,14 @@
 # See: https://github.com/ansible/galaxy/issues/46
 
 name: Release
-'on':
+on:
   push:
     tags:
     - '*'
 
 defaults:
   run:
-    working-directory: 'geerlingguy.pip'
+    working-directory: geerlingguy.pip
 
 jobs:
 
@@ -24,12 +23,12 @@ jobs:
     - name: Check out the codebase.
       uses: actions/checkout@v2
       with:
-          path: 'geerlingguy.pip'
+        path: geerlingguy.pip
 
     - name: Set up Python 3.
       uses: actions/setup-python@v2
       with:
-          python-version: '3.x'
+        python-version: 3.x
 
     - name: Install Ansible.
       run: pip3 install ansible-core
@@ -37,4 +36,5 @@ jobs:
     - name: Trigger a new import on Galaxy.
       run: >-
         ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }}
-          $(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository }} | cut -d/ -f2)
+        $(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository
+        }} | cut -d/ -f2)

roles/geerlingguy.pip/defaults/main.yml

@@ -1,4 +1,3 @@
----
 # For Python 3, use python3-pip.
 pip_package: python3-pip
 pip_executable: "{{ 'pip3' if pip_package.startswith('python3') else 'pip' }}"

roles/geerlingguy.pip/meta/main.yml

@@ -1,4 +1,3 @@
----
 dependencies: []
 
 galaxy_info:
@@ -6,8 +5,8 @@ galaxy_info:
   author: geerlingguy
   description: Pip (Python package manager) for Linux.
   issue_tracker_url: https://github.com/geerlingguy/ansible-role-pip/issues
-  company: "Midwestern Mac, LLC"
+  company: Midwestern Mac, LLC
-  license: "MIT"
+  license: MIT
   min_ansible_version: 2.4
   platforms:
   - name: EL

roles/geerlingguy.pip/molecule/default/converge.yml

@@ -1,4 +1,3 @@
----
 - name: Converge
   hosts: all
   become: true
@@ -7,7 +6,7 @@
     pip_install_packages:
       # Test installing a specific version of a package.
     - name: ipaddress
-        version: "1.0.18"
+      version: 1.0.18
       # Test installing a package by name.
     - colorama
 
@@ -20,9 +19,12 @@
     set_fact:
       pip_package: python-pip
     when: >
-        (ansible_os_family == 'RedHat') and (ansible_distribution_major_version | int < 8)
+      (ansible_os_family == 'RedHat') and (ansible_distribution_major_version | int
-        or (ansible_distribution == 'Debian') and (ansible_distribution_major_version | int < 10)
+      < 8)
-        or (ansible_distribution == 'Ubuntu') and (ansible_distribution_major_version | int < 18)
+      or (ansible_distribution == 'Debian') and (ansible_distribution_major_version
+      | int < 10)
+      or (ansible_distribution == 'Ubuntu') and (ansible_distribution_major_version
+      | int < 18)
 
   roles:
   - role: geerlingguy.pip

roles/geerlingguy.pip/molecule/default/molecule.yml

@@ -1,4 +1,3 @@
----
 role_name_check: 1
 dependency:
   name: galaxy
@@ -6,7 +5,7 @@ driver:
   name: docker
 platforms:
 - name: instance
-    image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
+  image: geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest
   command: ${MOLECULE_DOCKER_COMMAND:-""}
   volumes:
   - /sys/fs/cgroup:/sys/fs/cgroup:ro

roles/geerlingguy.pip/tasks/main.yml

@@ -1,15 +1,14 @@
----
 - name: Ensure Pip is installed.
   package:
-    name: "{{ pip_package }}"
+    name: '{{ pip_package }}'
     state: present
 
 - name: Ensure pip_install_packages are installed.
   pip:
-    name: "{{ item.name | default(item) }}"
+    name: '{{ item.name | default(item) }}'
-    version: "{{ item.version | default(omit) }}"
+    version: '{{ item.version | default(omit) }}'
-    virtualenv: "{{ item.virtualenv | default(omit) }}"
+    virtualenv: '{{ item.virtualenv | default(omit) }}'
-    state: "{{ item.state | default(omit) }}"
+    state: '{{ item.state | default(omit) }}'
-    extra_args: "{{ item.extra_args | default(omit) }}"
+    extra_args: '{{ item.extra_args | default(omit) }}'
-    executable: "{{ pip_executable }}"
+    executable: '{{ pip_executable }}'
-  loop: "{{ pip_install_packages }}"
+  loop: '{{ pip_install_packages }}'

roles/geerlingguy.samba/.github/FUNDING.yml

@@ -1,4 +1,2 @@
-# These are supported funding model platforms
----
 github: geerlingguy
 patreon: geerlingguy

roles/geerlingguy.samba/.github/stale.yml

@@ -41,7 +41,8 @@ pulls:
     This pull request is no longer marked for closure.
 
   closeComment: >-
-    This pull request has been closed due to inactivity. If you feel this is in error, please reopen the pull request or file a new PR with the relevant details.
+    This pull request has been closed due to inactivity. If you feel this is in error,
+    please reopen the pull request or file a new PR with the relevant details.
 
 issues:
   markComment: |-
@@ -53,4 +54,5 @@ issues:
     This issue is no longer marked for closure.
 
   closeComment: >-
-    This issue has been closed due to inactivity. If you feel this is in error, please reopen the issue or file a new issue with the relevant details.
+    This issue has been closed due to inactivity. If you feel this is in error, please
+    reopen the issue or file a new issue with the relevant details.

roles/geerlingguy.samba/.github/workflows/ci.yml

@@ -1,16 +1,15 @@
----
 name: CI
-'on':
+on:
   pull_request:
   push:
     branches:
     - master
   schedule:
-    - cron: "0 3 * * 4"
+  - cron: 0 3 * * 4
 
 defaults:
   run:
-    working-directory: 'geerlingguy.samba'
+    working-directory: geerlingguy.samba
 
 jobs:
 
@@ -21,12 +20,12 @@ jobs:
     - name: Check out the codebase.
       uses: actions/checkout@v2
       with:
-          path: 'geerlingguy.samba'
+        path: geerlingguy.samba
 
     - name: Set up Python 3.
       uses: actions/setup-python@v2
       with:
-          python-version: '3.x'
+        python-version: 3.x
 
     - name: Install test dependencies.
       run: pip3 install yamllint ansible-lint
@@ -49,12 +48,12 @@ jobs:
     - name: Check out the codebase.
       uses: actions/checkout@v2
       with:
-          path: 'geerlingguy.samba'
+        path: geerlingguy.samba
 
     - name: Set up Python 3.
       uses: actions/setup-python@v2
       with:
-          python-version: '3.x'
+        python-version: 3.x
 
     - name: Install test dependencies.
       run: pip3 install ansible molecule[docker] docker

roles/geerlingguy.samba/.github/workflows/release.yml

@@ -1,4 +1,3 @@
----
 # This workflow requires a GALAXY_API_KEY secret present in the GitHub
 # repository or organization.
 #
@@ -6,14 +5,14 @@
 # See: https://github.com/ansible/galaxy/issues/46
 
 name: Release
-'on':
+on:
   push:
     tags:
     - '*'
 
 defaults:
   run:
-    working-directory: 'geerlingguy.samba'
+    working-directory: geerlingguy.samba
 
 jobs:
 
@@ -24,15 +23,17 @@ jobs:
     - name: Check out the codebase.
       uses: actions/checkout@v2
       with:
-          path: 'geerlingguy.samba'
+        path: geerlingguy.samba
 
     - name: Set up Python 3.
       uses: actions/setup-python@v2
       with:
-          python-version: '3.x'
+        python-version: 3.x
 
     - name: Install Ansible.
       run: pip3 install ansible-base
 
     - name: Trigger a new import on Galaxy.
-        run: ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }} $(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository }} | cut -d/ -f2)
+      run: ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }} $(echo
+        ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository }} |
+        cut -d/ -f2)

roles/geerlingguy.samba/handlers/main.yml

@@ -1,3 +1,2 @@
----
 - name: restart smb
-  service: "name={{ samba_daemon }} state=restarted"
+  service: name={{ samba_daemon }} state=restarted

roles/geerlingguy.samba/meta/main.yml

@@ -1,12 +1,11 @@
----
 dependencies: []
 
 galaxy_info:
   role_name: samba
   author: geerlingguy
-  description: "Samba for RHEL/CentOS."
+  description: Samba for RHEL/CentOS.
-  company: "Midwestern Mac, LLC"
+  company: Midwestern Mac, LLC
-  license: "license (BSD, MIT)"
+  license: license (BSD, MIT)
   min_ansible_version: 2.0
   platforms:
   - name: EL

roles/geerlingguy.samba/molecule/default/converge.yml

@@ -1,4 +1,3 @@
----
 - name: Converge
   hosts: all
   become: true

roles/geerlingguy.samba/molecule/default/molecule.yml

@@ -1,11 +1,10 @@
----
 dependency:
   name: galaxy
 driver:
   name: docker
 platforms:
 - name: instance
-    image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
+  image: geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest
   command: ${MOLECULE_DOCKER_COMMAND:-""}
   volumes:
   - /sys/fs/cgroup:/sys/fs/cgroup:ro

roles/geerlingguy.samba/tasks/main.yml

@@ -1,6 +1,5 @@
----
 - name: Include OS-specific variables.
-  include_vars: "{{ ansible_os_family }}.yml"
+  include_vars: '{{ ansible_os_family }}.yml'
 
 - name: Ensure Samba-related packages are installed (RedHat).
   package:
@@ -22,6 +21,6 @@
 
 - name: Ensure Samba is running and set to start on boot.
   service:
-    name: "{{ samba_daemon }}"
+    name: '{{ samba_daemon }}'
     state: started
     enabled: true

roles/geerlingguy.samba/vars/Debian.yml

@@ -1,2 +1 @@
----
 samba_daemon: smbd

roles/geerlingguy.samba/vars/RedHat.yml

@@ -1,2 +1 @@
----
 samba_daemon: smb

roles/setup_hosted_services/defaults/main.yml

@@ -1 +1,2 @@
----
+null
+...

roles/setup_hosted_services/meta/main.yml

@@ -3,7 +3,7 @@ galaxy_info:
   namespace: chatton
   description: Deploy all my hosted services
   license: MIT
-  min_ansible_version: "2.1"
+  min_ansible_version: '2.1'
   galaxy_tags: []
   platforms:
   - name: Debian

roles/setup_hosted_services/tasks/main.yml

@@ -1,4 +1,3 @@
----
 - name: Install Modules for Python
   ansible.builtin.pip:
     name:
@@ -16,42 +15,42 @@
     path: '{{ file_item.dest_directory }}'
     state: directory
     mode: '0755'
-  with_items: "{{ portainer_required_files }}"
+  with_items: '{{ portainer_required_files }}'
   loop_control:
     loop_var: file_item
 
 - name: Create required files.
   ansible.builtin.copy:
-    src: "{{ file_item.source_file }}"
+    src: '{{ file_item.source_file }}'
     dest: '{{ file_item.dest_directory }}/{{ file_item.dest_file_name }}'
     owner: root
     group: root
     mode: 0440
-  with_items: "{{ portainer_required_files }}"
+  with_items: '{{ portainer_required_files }}'
   loop_control:
     loop_var: file_item
-  notify: "{{ file_item.handler }}"
+  notify: '{{ file_item.handler }}'
 
 - name: Create required directories (templates).
   ansible.builtin.file:
     path: '{{ file_template.dest_directory }}'
     state: directory
     mode: '0755'
-  with_items: "{{ portainer_required_templates }}"
+  with_items: '{{ portainer_required_templates }}'
   loop_control:
     loop_var: file_template
 
 - name: Create required templates.
   ansible.builtin.template:
-    src: "{{ file_template.source_file }}"
+    src: '{{ file_template.source_file }}'
-    dest: "{{ file_template.dest_directory }}/{{ file_template.dest_file_name }}"
+    dest: '{{ file_template.dest_directory }}/{{ file_template.dest_file_name }}'
     owner: root
     group: root
     mode: 0440
-  with_items: "{{ portainer_required_templates }}"
+  with_items: '{{ portainer_required_templates }}'
   loop_control:
     loop_var: file_template
-  notify: "{{ file_template.handler }}"
+  notify: '{{ file_template.handler }}'
 
 - name: Create external docker networks.
   docker_network:
@@ -62,30 +61,32 @@
   ansible.builtin.include_role:
     name: deploy_portainer_stack
   vars:
-    portainer_stack_name: "{{ portainer_stack.name }}"
+    portainer_stack_name: '{{ portainer_stack.name }}'
-    portainer_stack_endpoint_id: "{{ portainer_endpoint }}"
+    portainer_stack_endpoint_id: '{{ portainer_endpoint }}'
-    portainer_stack_template_vars: "{{ portainer_stack.template_vars | default({}) }}"
+    portainer_stack_template_vars: '{{ portainer_stack.template_vars | default({})
-  with_items: "{{ services }}"
+      }}'
+  with_items: '{{ services }}'
   loop_control:
     loop_var: portainer_stack
 
 - name: Install Ansible pull
-  tags: ["cron"]
+  tags: [cron]
   ansible.builtin.pip:
     name:
     - ansible
 
 # TODO: need to specify ansible pull directly, it doesn't find it when it's in PATH
 - name: Ensure Nightly Cron Backups
-  tags: ["cron"]
+  tags: [cron]
   ansible.builtin.cron:
     name: backup docker volumes (nightly)
-    weekday: "*"
+    weekday: '*'
-    minute: "0"
+    minute: '0'
-    hour: "{{ cron_hour }}"
+    hour: '{{ cron_hour }}'
-    user: "{{ homelab_user }}"
+    user: '{{ homelab_user }}'
     job: >
       {{ ansible_pull_path }}
-      -U https://github.com/chatton/ansible-homelab playbooks/backup-docker-volumes.yml -e schedule=nightly >> ~/logs/nightly.log 2>&1
+      -U https://github.com/chatton/ansible-homelab playbooks/backup-docker-volumes.yml
+      -e schedule=nightly >> ~/logs/nightly.log 2>&1
     cron_file: ansible_nightly_docker_volume_backup
     state: present

roles/setup_linode/defaults/main-vault.yml

@@ -1,12 +1,7 @@
-$ANSIBLE_VAULT;1.1;AES256
+$ANSIBLE_VAULT;1.1;AES256 38343033383061343739363362626366376630376337376639376235316665363736376362633830
-38343033383061343739363362626366376630376337376639376235316665363736376362633830
+6638383135303063363866623262303736393337386364630a353533323537376437343033666334 32353832353466343832643238313834616662333736363738353565623063316438393635343631
-6638383135303063363866623262303736393337386364630a353533323537376437343033666334
+6662366132396337320a326335353333306262666561353037356539633432376439666133386463 30326230316634346431346266333030303435313065616665656362663164313638313639313633
-32353832353466343832643238313834616662333736363738353565623063316438393635343631
+63343538653230653330383336386138643636333361326139346336646665366530343537663331 61303639313335343162613838303034616362303935653862666166656634613562376330306165
-6662366132396337320a326335353333306262666561353037356539633432376439666133386463
+32373832666438623638616363363931636664633337396336653237356234616438623261353134 62373463313235323233343734363561353237613439663534393537333964323932373837356564
-30326230316634346431346266333030303435313065616665656362663164313638313639313633
+32383536613332323532633534306632373762666236366664383636323264363433396437666437 323637336362613139633237316237666365
-63343538653230653330383336386138643636333361326139346336646665366530343537663331
+...
-61303639313335343162613838303034616362303935653862666166656634613562376330306165
-32373832666438623638616363363931636664633337396336653237356234616438623261353134
-62373463313235323233343734363561353237613439663534393537333964323932373837356564
-32383536613332323532633534306632373762666236366664383636323264363433396437666437
-323637336362613139633237316237666365

roles/setup_linode/meta/main.yml

@@ -4,7 +4,7 @@ galaxy_info:
   description: Setup Linode instance
   license: MIT
 
-  min_ansible_version: "2.1"
+  min_ansible_version: '2.1'
   platforms:
   - name: Debian
     versions:

roles/setup_linode/tasks/main.yml

@@ -1,4 +1,3 @@
----
 - name: Include vault variables.
   ansible.builtin.include_vars: defaults/main-vault.yml
 
@@ -18,7 +17,7 @@
 - name: Wait for SSH to come up
   delegate_to: localhost
   ansible.builtin.wait_for:
-    host: "{{ my_linode.instance.ipv4[0] }}"
+    host: '{{ my_linode.instance.ipv4[0] }}'
     port: 22
     search_regex: OpenSSH
     timeout: 320

roles/setup_mergerfs/meta/main.yml

@@ -3,7 +3,7 @@ galaxy_info:
   namespace: chatton
   description: Configures Mergerfs
   license: MIT
-  min_ansible_version: "2.1"
+  min_ansible_version: '2.1'
   platforms:
   - name: Debian
     versions:

roles/setup_mergerfs/tasks/main.yml

@@ -1,4 +1,3 @@
----
 - name: Mount Volumes
   ansible.builtin.mount:
     path: '{{ item.path }}'
@@ -11,7 +10,7 @@
 
 - name: Display volumes.
   ansible.builtin.debug:
-    var: "{{ volume_out }}"
+    var: '{{ volume_out }}'
     verbosity: 3
 
 # tasks file for setup_mergerfs

roles/setup_portainer/tasks/main.yml

@@ -1,4 +1,3 @@
----
 - name: Portainer | Pull images
   docker_image:
     name: ubuntu
@@ -24,7 +23,7 @@
           labels:
             ie.cianhatton.backup.enabled: 'true'
             ie.cianhatton.backup.schedule: nightly
-          image: "portainer/portainer-ce:{{ portainer_version }}"
+          image: portainer/portainer-ce:{{ portainer_version }}
           container_name: portainer
           restart: unless-stopped
           ports:

roles/setup_samba/defaults/main.yml

@@ -1,4 +1,3 @@
----
 samba_group: smbgroup
 samba_user: smbuser
 users:

roles/setup_samba/meta/main.yml

@@ -4,7 +4,7 @@ galaxy_info:
   description: Setup Samba Shares for my Home Lab.
   license: MIT
 
-  min_ansible_version: "2.1"
+  min_ansible_version: '2.1'
   platforms:
   - name: Debian
     versions:

roles/setup_samba/tasks/main.yml

@@ -1,4 +1,3 @@
----
 - name: Ensure samba group exists.
   ansible.builtin.group:
     name: '{{ samba_group }}'
@@ -26,10 +25,10 @@
 - name: Copy smb conf files.
   ansible.builtin.copy:
     src: '{{ item }}'
-    dest: "/etc/samba/{{ item }}"
+    dest: /etc/samba/{{ item }}
     mode: 0644
-    owner: "{{ samba_user }}"
+    owner: '{{ samba_user }}'
-    group: "{{ samba_group }}"
+    group: '{{ samba_group }}'
   with_items:
   - smb.conf
   - shares.conf

roles/setup_users/meta/main.yml

@@ -4,7 +4,7 @@ galaxy_info:
   description: Setup users for my Home Lab
   license: MIT
 
-  min_ansible_version: "2.1"
+  min_ansible_version: '2.1'
   platforms:
   - name: Debian
     versions:

roles/setup_users/tasks/main.yml

@@ -37,21 +37,21 @@
 - name: Copy Bashrc.
   ansible.builtin.copy:
     src: bash_rc
-    dest: "/home/{{ homelab_user }}/.bash_rc"
+    dest: /home/{{ homelab_user }}/.bash_rc
-    group: "{{ homelab_user }}"
+    group: '{{ homelab_user }}'
-    owner: "{{ homelab_user }}"
+    owner: '{{ homelab_user }}'
     mode: 0644
 
 - name: Disable password authentication for root.
   ansible.builtin.lineinfile:
     path: /etc/ssh/sshd_config
     state: present
-    regexp: '^#?PermitRootLogin'
+    regexp: ^#?PermitRootLogin
-    line: 'PermitRootLogin prohibit-password'
+    line: PermitRootLogin prohibit-password
 
 - name: Disable password authentication for users.
   ansible.builtin.lineinfile:
     path: /etc/ssh/sshd_config
     state: present
-    regexp: '^#?PasswordAuthentication'
+    regexp: ^#?PasswordAuthentication
-    line: 'PasswordAuthentication no'
+    line: PasswordAuthentication no

roles/sprat.mergerfs/.github/workflows/ci.yml

@@ -1,9 +1,8 @@
----
 name: CI
 on:  # yamllint disable-line rule:truthy
   push:
   schedule:
-    - cron: "0 5 * * 1"
+  - cron: 0 5 * * 1
 
 jobs:
   # test the role
@@ -44,7 +43,7 @@ jobs:
     - name: Setup Python 3
       uses: actions/setup-python@v2
       with:
-          python-version: '3.x'
+        python-version: 3.x
 
     - name: Install dependencies
       run: |

roles/sprat.mergerfs/.yamllint.yml

@@ -1,4 +1,3 @@
----
 extends: default
 
 ignore: |

roles/sprat.mergerfs/defaults/main.yml

@@ -1,4 +1,3 @@
----
 # Install mode: defines where to download and install the package from:
 # - "github_releases": install from Mergerfs' GitHub releases
 # - "package_manager": install from the Linux distribution package manager.

roles/sprat.mergerfs/meta/main.yml

@@ -1,4 +1,3 @@
----
 galaxy_info:
   author: Sylvain Prat
   role_name: mergerfs

roles/sprat.mergerfs/molecule/default/converge.yml

@@ -1,4 +1,3 @@
----
 - name: Converge
   hosts: all
   vars:

roles/sprat.mergerfs/molecule/default/molecule.yml

@@ -1,4 +1,3 @@
----
 dependency:
   name: galaxy
 driver:

roles/sprat.mergerfs/molecule/default/prepare.yml

@@ -1,11 +1,10 @@
----
 - name: Prepare
   hosts: all
   tasks:
   - name: Create directories
     become: true
     file:
-        path: "{{ item }}"
+      path: '{{ item }}'
       state: directory
     loop:
     - /mnt/data1
@@ -15,7 +14,7 @@
     become: true
     copy:
       content: "{{ item.content }}\n"
-        dest: "{{ item.path }}"
+      dest: '{{ item.path }}'
     loop:
     - path: /mnt/data1/file1.txt
       content: file1

roles/sprat.mergerfs/tasks/install_from_github_releases.yml

@@ -1,4 +1,3 @@
----
 # Note: we don't use the GitHub API to retrieve the latest version because
 # it has rate limits which are hard to avoid in CI (we need a token, authenticate
 # with the API, etc.). Instead, we browse the latest release url which redirects
@@ -9,7 +8,7 @@
   block:
   - name: Get latest release information from GitHub
     uri:
-      url: "{{ mergerfs_github_releases_url }}/latest"
+      url: '{{ mergerfs_github_releases_url }}/latest'
     register: mergerfs_github_release_page
   - name: Set latest mergerfs version fact
     set_fact:
@@ -18,8 +17,8 @@
 
 - name: Determine package download url
   set_fact:
-    mergerfs_package_url: "{{ mergerfs_github_releases_url }}/download/{{ mergerfs_version }}/\
+    mergerfs_package_url: '{{ mergerfs_github_releases_url }}/download/{{ mergerfs_version
-      {{ mergerfs_pkg_prefix }}{{ mergerfs_version }}{{ mergerfs_pkg_suffix }}"
+      }}/{{ mergerfs_pkg_prefix }}{{ mergerfs_version }}{{ mergerfs_pkg_suffix }}'
 
 - name: Install xz-utils package for .deb package installation
   become: true
@@ -32,7 +31,7 @@
 - name: Install mergerfs package with apt
   become: true
   apt:
-    deb: "{{ mergerfs_package_url }}"
+    deb: '{{ mergerfs_package_url }}'
     state: present
     update_cache: true
   when: ansible_pkg_mgr == 'apt'
@@ -40,7 +39,7 @@
 - name: Install mergerfs package with yum
   become: true
   yum:
-    name: "{{ mergerfs_package_url }}"
+    name: '{{ mergerfs_package_url }}'
     state: present
     disable_gpg_check: true  # the package is not signed
   when: ansible_pkg_mgr == 'yum'
@@ -48,7 +47,7 @@
 - name: Install mergerfs package with dnf
   become: true
   dnf:
-    name: "{{ mergerfs_package_url }}"
+    name: '{{ mergerfs_package_url }}'
     state: present
     disable_gpg_check: true  # the package is not signed
   when: ansible_pkg_mgr == 'dnf'

roles/sprat.mergerfs/tasks/install_from_package_manager.yml

@@ -1,4 +1,3 @@
----
 - name: Install mergerfs package with package manager
   become: true
   package:

roles/sprat.mergerfs/tasks/main.yml

@@ -1,13 +1,12 @@
----
 - name: Include OS-specific variables
-  include_vars: "{{ ansible_os_family }}.yml"
+  include_vars: '{{ ansible_os_family }}.yml'
   tags:
   - mergerfs
 
 - name: Install mergerfs prerequisites
   become: true
   package:
-    name: "{{ mergerfs_prerequisites }}"
+    name: '{{ mergerfs_prerequisites }}'
     state: present
     update_cache: true
   tags:
@@ -25,10 +24,10 @@
   mount:
     fstype: fuse.mergerfs
     src: "{{ ':'.join(item.branches | mandatory) }}"
-    path: "{{ item.path | mandatory }}"
+    path: '{{ item.path | mandatory }}'
     opts: "{{ item.options | default('defaults') }}"
     state: "{{ item.state | default('mounted') }}"
-  loop: "{{ mergerfs_mounts }}"
+  loop: '{{ mergerfs_mounts }}'
   tags:
   - mergerfs
   - mergerfs_mount

roles/sprat.mergerfs/vars/Debian.yml

@@ -1,12 +1,12 @@
----
 mergerfs_prerequisites:
 - fuse
-mergerfs_dist: "{{ ansible_distribution|lower }}-{{ ansible_distribution_release }}"
+mergerfs_dist: '{{ ansible_distribution|lower }}-{{ ansible_distribution_release }}'
 mergerfs_arch_map:
   x86_64: amd64
   i386: i386
   aarch64: arm64
   armv7l: armhf
-mergerfs_arch: "{{ mergerfs_arch_map[ansible_userspace_architecture | default(ansible_architecture) ] }}"
+mergerfs_arch: '{{ mergerfs_arch_map[ansible_userspace_architecture | default(ansible_architecture)
-mergerfs_pkg_prefix: "mergerfs_"
+  ] }}'
-mergerfs_pkg_suffix: ".{{ mergerfs_dist }}_{{ mergerfs_arch }}.deb"
+mergerfs_pkg_prefix: mergerfs_
+mergerfs_pkg_suffix: .{{ mergerfs_dist }}_{{ mergerfs_arch }}.deb

roles/sprat.mergerfs/vars/RedHat.yml

@@ -1,7 +1,7 @@
----
 mergerfs_prerequisites:
 - fuse
-mergerfs_dist: "{{ 'fc' if ansible_distribution == 'Fedora' else 'el' }}{{ ansible_distribution_major_version }}"
+mergerfs_dist: "{{ 'fc' if ansible_distribution == 'Fedora' else 'el' }}{{ ansible_distribution_major_version\
-mergerfs_arch: "{{ ansible_userspace_architecture }}"
+  \ }}"
-mergerfs_pkg_prefix: "mergerfs-"
+mergerfs_arch: '{{ ansible_userspace_architecture }}'
-mergerfs_pkg_suffix: "-1.{{ mergerfs_dist }}.{{ mergerfs_arch }}.rpm"
+mergerfs_pkg_prefix: mergerfs-
+mergerfs_pkg_suffix: -1.{{ mergerfs_dist }}.{{ mergerfs_arch }}.rpm