ci: migrate to woodpecker

.drone.jsonnet

@@ -1,159 +0,0 @@
-local PipelineLinting = {
-  kind: 'pipeline',
-  name: 'linting',
-  platform: {
-    os: 'linux',
-    arch: 'amd64',
-  },
-  steps: [
-    {
-      name: 'ansible-later',
-      image: 'thegeeklab/ansible-later',
-      commands: [
-        'ansible-later',
-      ],
-    },
-    {
-      name: 'python-format',
-      image: 'python:3.11',
-      environment: {
-        PY_COLORS: 1,
-      },
-      commands: [
-        'pip install -qq yapf',
-        '[ ! -z "$(find . -type f -name *.py)" ] && yapf -rd ./',
-      ],
-    },
-    {
-      name: 'python-flake8',
-      image: 'python:3.11',
-      environment: {
-        PY_COLORS: 1,
-      },
-      commands: [
-        'pip install -qq flake8',
-        'flake8',
-      ],
-    },
-  ],
-  trigger: {
-    ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'],
-  },
-};
-
-local PipelineDeployment(scenario='rocky8') = {
-  kind: 'pipeline',
-  name: 'testing-' + scenario,
-  platform: {
-    os: 'linux',
-    arch: 'amd64',
-  },
-  concurrency: {
-    limit: 1,
-  },
-  workspace: {
-    base: '/drone/src',
-    path: '${DRONE_REPO_NAME}',
-  },
-  steps: [
-    {
-      name: 'ansible-molecule',
-      image: 'thegeeklab/molecule:4',
-      environment: {
-        HCLOUD_TOKEN: { from_secret: 'hcloud_token' },
-      },
-      commands: [
-        'molecule test -s ' + scenario,
-      ],
-    },
-  ],
-  depends_on: [
-    'linting',
-  ],
-  trigger: {
-    ref: ['refs/heads/main', 'refs/tags/**'],
-  },
-};
-
-local PipelineDocumentation = {
-  kind: 'pipeline',
-  name: 'documentation',
-  platform: {
-    os: 'linux',
-    arch: 'amd64',
-  },
-  steps: [
-    {
-      name: 'generate',
-      image: 'thegeeklab/ansible-doctor',
-      environment: {
-        ANSIBLE_DOCTOR_LOG_LEVEL: 'INFO',
-        ANSIBLE_DOCTOR_FORCE_OVERWRITE: true,
-        ANSIBLE_DOCTOR_EXCLUDE_FILES: 'molecule/',
-        ANSIBLE_DOCTOR_TEMPLATE: 'hugo-book',
-        ANSIBLE_DOCTOR_ROLE_NAME: '${DRONE_REPO_NAME#*.}',
-        ANSIBLE_DOCTOR_OUTPUT_DIR: '_docs/',
-      },
-    },
-    {
-      name: 'publish',
-      image: 'plugins/gh-pages',
-      settings: {
-        remote_url: 'https://gitea.rknet.org/ansible/${DRONE_REPO_NAME}',
-        netrc_machine: 'gitea.rknet.org',
-        username: { from_secret: 'gitea_username' },
-        password: { from_secret: 'gitea_token' },
-        pages_directory: '_docs/',
-        target_branch: 'docs',
-      },
-      when: {
-        ref: ['refs/heads/main'],
-      },
-    },
-  ],
-  trigger: {
-    ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'],
-  },
-  depends_on: [
-    'testing-rocky8',
-  ],
-};
-
-local PipelineNotification = {
-  kind: 'pipeline',
-  name: 'notification',
-  platform: {
-    os: 'linux',
-    arch: 'amd64',
-  },
-  clone: {
-    disable: true,
-  },
-  steps: [
-    {
-      name: 'matrix',
-      image: 'thegeeklab/drone-matrix',
-      settings: {
-        homeserver: { from_secret: 'matrix_homeserver' },
-        roomid: { from_secret: 'matrix_roomid' },
-        template: 'Status: **{{ .Build.Status }}**<br/> Build: [{{ .Repo.Owner }}/{{ .Repo.Name }}]({{ .Build.Link }}){{ if .Build.Branch }} ({{ .Build.Branch }}){{ end }} by {{ .Commit.Author }}<br/> Message: {{ .Commit.Message.Title }}',
-        username: { from_secret: 'matrix_username' },
-        password: { from_secret: 'matrix_password' },
-      },
-    },
-  ],
-  depends_on: [
-    'documentation',
-  ],
-  trigger: {
-    status: ['success', 'failure'],
-    ref: ['refs/heads/main', 'refs/tags/**'],
-  },
-};
-
-[
-  PipelineLinting,
-  PipelineDeployment(scenario='rocky8'),
-  PipelineDocumentation,
-  PipelineNotification,
-]

.drone.yml

@@ -1,152 +0,0 @@
----
-kind: pipeline
-name: linting
-
-platform:
-  os: linux
-  arch: amd64
-
-steps:
-  - name: ansible-later
-    image: thegeeklab/ansible-later
-    commands:
-      - ansible-later
-
-  - name: python-format
-    image: python:3.11
-    commands:
-      - pip install -qq yapf
-      - "[ ! -z \"$(find . -type f -name *.py)\" ] && yapf -rd ./"
-    environment:
-      PY_COLORS: 1
-
-  - name: python-flake8
-    image: python:3.11
-    commands:
-      - pip install -qq flake8
-      - flake8
-    environment:
-      PY_COLORS: 1
-
-trigger:
-  ref:
-    - refs/heads/main
-    - refs/tags/**
-    - refs/pull/**
-
----
-kind: pipeline
-name: testing-rocky8
-
-platform:
-  os: linux
-  arch: amd64
-
-concurrency:
-  limit: 1
-
-workspace:
-  base: /drone/src
-  path: ${DRONE_REPO_NAME}
-
-steps:
-  - name: ansible-molecule
-    image: thegeeklab/molecule:4
-    commands:
-      - molecule test -s rocky8
-    environment:
-      HCLOUD_TOKEN:
-        from_secret: hcloud_token
-
-trigger:
-  ref:
-    - refs/heads/main
-    - refs/tags/**
-
-depends_on:
-  - linting
-
----
-kind: pipeline
-name: documentation
-
-platform:
-  os: linux
-  arch: amd64
-
-steps:
-  - name: generate
-    image: thegeeklab/ansible-doctor
-    environment:
-      ANSIBLE_DOCTOR_EXCLUDE_FILES: molecule/
-      ANSIBLE_DOCTOR_FORCE_OVERWRITE: true
-      ANSIBLE_DOCTOR_LOG_LEVEL: INFO
-      ANSIBLE_DOCTOR_OUTPUT_DIR: _docs/
-      ANSIBLE_DOCTOR_ROLE_NAME: ${DRONE_REPO_NAME#*.}
-      ANSIBLE_DOCTOR_TEMPLATE: hugo-book
-
-  - name: publish
-    image: plugins/gh-pages
-    settings:
-      netrc_machine: gitea.rknet.org
-      pages_directory: _docs/
-      password:
-        from_secret: gitea_token
-      remote_url: https://gitea.rknet.org/ansible/${DRONE_REPO_NAME}
-      target_branch: docs
-      username:
-        from_secret: gitea_username
-    when:
-      ref:
-        - refs/heads/main
-
-trigger:
-  ref:
-    - refs/heads/main
-    - refs/tags/**
-    - refs/pull/**
-
-depends_on:
-  - testing-rocky8
-
----
-kind: pipeline
-name: notification
-
-platform:
-  os: linux
-  arch: amd64
-
-clone:
-  disable: true
-
-steps:
-  - name: matrix
-    image: thegeeklab/drone-matrix
-    settings:
-      homeserver:
-        from_secret: matrix_homeserver
-      password:
-        from_secret: matrix_password
-      roomid:
-        from_secret: matrix_roomid
-      template: "Status: **{{ .Build.Status }}**<br/> Build: [{{ .Repo.Owner }}/{{ .Repo.Name }}]({{ .Build.Link }}){{ if .Build.Branch }} ({{ .Build.Branch }}){{ end }} by {{ .Commit.Author }}<br/> Message: {{ .Commit.Message.Title }}"
-      username:
-        from_secret: matrix_username
-
-trigger:
-  ref:
-    - refs/heads/main
-    - refs/tags/**
-  status:
-    - success
-    - failure
-
-depends_on:
-  - documentation
-
----
-kind: signature
-hmac: 142470001529bdfe2023c003b47b01927758a56878da3d0b12d16ce11629bb25
-
-...

.later.yml

@@ -10,10 +10,6 @@ ansible:
 
 rules:
   exclude_files:
-    - molecule/
     - "LICENSE*"
     - "**/*.md"
     - "**/*.ini"
-
-  exclude_filter:
-    - LINT0009

.markdownlint.yml

@@ -0,0 +1,7 @@
+---
+default: True
+MD013: False
+MD041: False
+MD024: False
+MD004:
+  style: dash

.prettierignore

@@ -1 +1 @@
-.drone*
+LICENSE

.woodpecker/docs.yaml

@@ -0,0 +1,47 @@
+---
+when:
+  - event: [pull_request]
+  - event: [push, manual]
+    branch:
+      - ${CI_REPO_DEFAULT_BRANCH}
+
+steps:
+  - name: generate
+    image: quay.io/thegeeklab/ansible-doctor
+    environment:
+      ANSIBLE_DOCTOR_EXCLUDE_FILES: molecule/
+      ANSIBLE_DOCTOR_FORCE_OVERWRITE: "true"
+      ANSIBLE_DOCTOR_LOG_LEVEL: INFO
+      ANSIBLE_DOCTOR_ROLE_NAME: ${CI_REPO_NAME}
+      ANSIBLE_DOCTOR_TEMPLATE: readme
+
+  - name: format
+    image: quay.io/thegeeklab/alpine-tools
+    commands:
+      - prettier -w README.md
+
+  - name: diff
+    image: quay.io/thegeeklab/alpine-tools
+    commands:
+      - git diff --color=always README.md
+
+  - name: publish
+    image: quay.io/thegeeklab/wp-git-action
+    settings:
+      action:
+        - commit
+        - push
+      author_email: ci-bot@rknet.org
+      author_name: ci-bot
+      branch: main
+      message: "[skip ci] automated docs update"
+      netrc_machine: gitea.rknet.org
+      netrc_password:
+        from_secret: gitea_token
+    when:
+      - event: [push, manual]
+        branch:
+          - ${CI_REPO_DEFAULT_BRANCH}
+
+depends_on:
+  - test

.woodpecker/lint.yaml

@@ -0,0 +1,30 @@
+---
+when:
+  - event: [pull_request, tag]
+  - event: [push, manual]
+    branch:
+      - ${CI_REPO_DEFAULT_BRANCH}
+
+steps:
+  - name: ansible-later
+    image: quay.io/thegeeklab/ansible-later:4
+    commands:
+      - ansible-later
+    environment:
+      FORCE_COLOR: "1"
+
+  - name: python-format
+    image: docker.io/python:3.12
+    commands:
+      - pip install -qq ruff
+      - ruff format --check --diff .
+    environment:
+      PY_COLORS: "1"
+
+  - name: python-lint
+    image: docker.io/python:3.12
+    commands:
+      - pip install -qq ruff
+      - ruff .
+    environment:
+      PY_COLORS: "1"

.woodpecker/notify.yml

@@ -0,0 +1,26 @@
+---
+when:
+  - event: [tag]
+  - event: [push, manual]
+    branch:
+      - ${CI_REPO_DEFAULT_BRANCH}
+
+runs_on: [success, failure]
+
+steps:
+  - name: matrix
+    image: quay.io/thegeeklab/wp-matrix
+    settings:
+      homeserver:
+        from_secret: matrix_homeserver
+      password:
+        from_secret: matrix_password
+      roomid:
+        from_secret: matrix_roomid
+      username:
+        from_secret: matrix_username
+    when:
+      - status: [success, failure]
+
+depends_on:
+  - docs

.woodpecker/test.yaml

@@ -0,0 +1,25 @@
+---
+when:
+  - event: [pull_request, tag]
+  - event: [push, manual]
+    branch:
+      - ${CI_REPO_DEFAULT_BRANCH}
+
+variables:
+  - &molecule_base
+    image: quay.io/thegeeklab/molecule:6
+    group: molecule
+    secrets:
+      - source: molecule_hcloud_token
+        target: HCLOUD_TOKEN
+    environment:
+      PY_COLORS: "1"
+
+steps:
+  - name: molecule-default
+    <<: *molecule_base
+    commands:
+      - molecule test -s default
+
+depends_on:
+  - lint

README.md

@@ -1,10 +1 @@
 # xoxys.firewalld
-
-[![Build Status](https://img.shields.io/drone/build/ansible/xoxys.firewalld?logo=drone&server=https%3A%2F%2Fdrone.rknet.org)](https://drone.rknet.org/ansible/xoxys.firewalld)
-[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg?label=license)](LICENSE)
-
-Setup and configure host firewall with firewalld. You can find the full documentation at [https://galaxy.geekdocs.de](https://galaxy.geekdocs.de/roles/security/firewalld/).
-
-## License
-
-This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details.

handlers/main.yml

@@ -1,8 +1,6 @@
 ---
 - name: Reload firewalld
-  service:
+  ansible.builtin.service:
     name: firewalld
     state: reloaded
   listen: __firewalld_reload
-  become: True
-  become_user: root

meta/main.yml

@@ -6,18 +6,17 @@ galaxy_info:
   namespace: xoxys
   role_name: firewalld
   # @meta description: >
-  # [![Source Code](https://img.shields.io/badge/gitea-source%20code-blue?logo=gitea&logoColor=white)](https://gitea.rknet.org/ansible/xoxys.firewalld)
+  # [![Build Status](https://ci.rknet.org/api/badges/ansible/xoxys.firewalld/status.svg)](https://ci.rknet.org/repos/ansible/xoxys.firewalld)
-  # [![Build Status](https://img.shields.io/drone/build/ansible/xoxys.firewalld?logo=drone&server=https%3A%2F%2Fdrone.rknet.org)](https://drone.rknet.org/ansible/xoxys.firewalld)
   # [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg?label=license)](https://gitea.rknet.org/ansible/xoxys.firewalld/src/branch/main/LICENSE)
   #
   # Setup and configure host firewall with firewalld.
   # @end
   description: Setup and configure host firewall with firewalld
   license: MIT
-  min_ansible_version: 2.10
+  min_ansible_version: "2.10"
   platforms:
     - name: EL
       versions:
-        - 7
+        - "9"
   galaxy_tags: []
 dependencies: []

molecule/default

@@ -1 +0,0 @@
-rocky8

molecule/default/converge.yml

@@ -2,4 +2,4 @@
 - name: Converge
   hosts: all
   roles:
-    - role: xoxys.firewalld
+    - role: xoxys.podman

molecule/default/molecule.yml

@@ -0,0 +1,17 @@
+---
+driver:
+  name: molecule_hetznercloud
+dependency:
+  name: galaxy
+  options:
+    role-file: molecule/requirements.yml
+    requirements-file: molecule/requirements.yml
+platforms:
+  - name: "rocky9-podman"
+    server_type: "cx11"
+    image: "rocky-9"
+provisioner:
+  name: ansible
+  log: False
+verifier:
+  name: testinfra

molecule/default/prepare.yml

@@ -0,0 +1,11 @@
+---
+- name: Prepare
+  hosts: all
+  gather_facts: False
+  tasks:
+    - name: Bootstrap Python for Ansible
+      ansible.builtin.raw: |
+        command -v python3 python ||
+        ((test -e /usr/bin/apt && (apt -y update && apt install -y python-minimal)) ||
+        echo "Warning: Python not boostrapped due to unknown platform.")
+      changed_when: False

molecule/default/tests/test_default.py

@@ -7,7 +7,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
 ).get_hosts("all")
 
 
-def test_firewalld_is_installed(host):
+def test_firewalld_installed(host):
     firewalld = host.package("firewalld")
     assert firewalld.is_installed
 

molecule/pytest.ini

@@ -1,3 +0,0 @@
-[pytest]
-filterwarnings =
-    ignore::DeprecationWarning

molecule/requirements.yml

@@ -1,6 +1,5 @@
 ---
 collections:
-  - name: https://gitea.rknet.org/ansible/xoxys.general/releases/download/v2.1.1/xoxys-general-2.1.1.tar.gz
+  - name: containers.podman
-  - name: community.general
 
 roles: []

molecule/rocky8/create.yml

@@ -1,120 +0,0 @@
----
-- name: Create
-  hosts: localhost
-  connection: local
-  gather_facts: false
-  no_log: "{{ molecule_no_log }}"
-  vars:
-    ssh_port: 22
-    ssh_user: root
-    ssh_path: "{{ lookup('env', 'MOLECULE_EPHEMERAL_DIRECTORY') }}/ssh_key"
-  tasks:
-    - name: Create SSH key
-      user:
-        name: "{{ lookup('env', 'USER') }}"
-        generate_ssh_key: true
-        ssh_key_file: "{{ ssh_path }}"
-        force: true
-      register: generated_ssh_key
-
-    - name: Register the SSH key name
-      set_fact:
-        ssh_key_name: "molecule-generated-{{ 12345 | random | to_uuid }}"
-
-    - name: Register SSH key for test instance(s)
-      hcloud_ssh_key:
-        name: "{{ ssh_key_name }}"
-        public_key: "{{ generated_ssh_key.ssh_public_key }}"
-        state: present
-
-    - name: Create molecule instance(s)
-      hcloud_server:
-        name: "{{ item.name }}"
-        server_type: "{{ item.server_type }}"
-        ssh_keys:
-          - "{{ ssh_key_name }}"
-        image: "{{ item.image }}"
-        location: "{{ item.location | default(omit) }}"
-        datacenter: "{{ item.datacenter | default(omit) }}"
-        user_data: "{{ item.user_data | default(omit) }}"
-        api_token: "{{ lookup('env', 'HCLOUD_TOKEN') }}"
-        state: present
-      register: server
-      loop: "{{ molecule_yml.platforms }}"
-      async: 7200
-      poll: 0
-
-    - name: Wait for instance(s) creation to complete
-      async_status:
-        jid: "{{ item.ansible_job_id }}"
-      register: hetzner_jobs
-      until: hetzner_jobs.finished
-      retries: 300
-      loop: "{{ server.results }}"
-
-    - name: Create volume(s)
-      hcloud_volume:
-        name: "{{ item.name }}"
-        server: "{{ item.name }}"
-        location: "{{ item.location | default(omit) }}"
-        size: "{{ item.volume_size | default(10) }}"
-        api_token: "{{ lookup('env', 'HCLOUD_TOKEN') }}"
-        state: "present"
-      loop: "{{ molecule_yml.platforms }}"
-      when: item.volume | default(False) | bool
-      register: volumes
-      async: 7200
-      poll: 0
-
-    - name: Wait for volume(s) creation to complete
-      async_status:
-        jid: "{{ item.ansible_job_id }}"
-      register: hetzner_volumes
-      until: hetzner_volumes.finished
-      retries: 300
-      when: volumes.changed
-      loop: "{{ volumes.results }}"
-
-    # Mandatory configuration for Molecule to function.
-
-    - name: Populate instance config dict
-      set_fact:
-        instance_conf_dict:
-          {
-            "instance": "{{ item.hcloud_server.name }}",
-            "ssh_key_name": "{{ ssh_key_name }}",
-            "address": "{{ item.hcloud_server.ipv4_address }}",
-            "user": "{{ ssh_user }}",
-            "port": "{{ ssh_port }}",
-            "identity_file": "{{ ssh_path }}",
-            "volume": "{{ item.item.item.volume | default(False) | bool }}",
-          }
-      loop: "{{ hetzner_jobs.results }}"
-      register: instance_config_dict
-      when: server.changed | bool
-
-    - name: Convert instance config dict to a list
-      set_fact:
-        instance_conf: "{{ instance_config_dict.results | map(attribute='ansible_facts.instance_conf_dict') | list }}"
-      when: server.changed | bool
-
-    - name: Dump instance config
-      copy:
-        content: |
-          # Molecule managed
-
-          {{ instance_conf | to_nice_yaml(indent=2) }}
-        dest: "{{ molecule_instance_config }}"
-      when: server.changed | bool
-
-    - name: Wait for SSH
-      wait_for:
-        port: "{{ ssh_port }}"
-        host: "{{ item.address }}"
-        search_regex: SSH
-        delay: 10
-      loop: "{{ lookup('file', molecule_instance_config) | from_yaml }}"
-
-    - name: Wait for VM to settle down
-      pause:
-        seconds: 30

molecule/rocky8/destroy.yml

@@ -1,78 +0,0 @@
----
-- name: Destroy
-  hosts: localhost
-  connection: local
-  gather_facts: false
-  no_log: "{{ molecule_no_log }}"
-  tasks:
-    - name: Check existing instance config file
-      stat:
-        path: "{{ molecule_instance_config }}"
-      register: cfg
-
-    - name: Populate the instance config
-      set_fact:
-        instance_conf: "{{ (lookup('file', molecule_instance_config) | from_yaml) if cfg.stat.exists else [] }}"
-
-    - name: Destroy molecule instance(s)
-      hcloud_server:
-        name: "{{ item.instance }}"
-        api_token: "{{ lookup('env', 'HCLOUD_TOKEN') }}"
-        state: absent
-      register: server
-      loop: "{{ instance_conf }}"
-      async: 7200
-      poll: 0
-
-    - name: Wait for instance(s) deletion to complete
-      async_status:
-        jid: "{{ item.ansible_job_id }}"
-      register: hetzner_jobs
-      until: hetzner_jobs.finished
-      retries: 300
-      loop: "{{ server.results }}"
-
-    - pause:
-        seconds: 5
-
-    - name: Destroy volume(s)
-      hcloud_volume:
-        name: "{{ item.instance }}"
-        server: "{{ item.instance }}"
-        api_token: "{{ lookup('env', 'HCLOUD_TOKEN') }}"
-        state: "absent"
-      register: volumes
-      loop: "{{ instance_conf }}"
-      when: item.volume | default(False) | bool
-      async: 7200
-      poll: 0
-
-    - name: Wait for volume(s) deletion to complete
-      async_status:
-        jid: "{{ item.ansible_job_id }}"
-      register: hetzner_volumes
-      until: hetzner_volumes.finished
-      retries: 300
-      when: volumes.changed
-      loop: "{{ volumes.results }}"
-
-    - name: Remove registered SSH key
-      hcloud_ssh_key:
-        name: "{{ instance_conf[0].ssh_key_name }}"
-        state: absent
-      when: (instance_conf | default([])) | length > 0
-
-    # Mandatory configuration for Molecule to function.
-
-    - name: Populate instance config
-      set_fact:
-        instance_conf: {}
-
-    - name: Dump instance config
-      copy:
-        content: |
-          # Molecule managed
-
-          {{ instance_conf | to_nice_yaml(indent=2) }}
-        dest: "{{ molecule_instance_config }}"
-      when: server.changed | bool

molecule/rocky8/molecule.yml

@@ -1,24 +0,0 @@
----
-dependency:
-  name: galaxy
-  options:
-    role-file: molecule/requirements.yml
-    requirements-file: molecule/requirements.yml
-  env:
-    ANSIBLE_GALAXY_DISPLAY_PROGRESS: "false"
-driver:
-  name: delegated
-platforms:
-  - name: rocky8-firewalld
-    image: rocky-8
-    server_type: cx11
-lint: |
-  /usr/local/bin/flake8
-provisioner:
-  name: ansible
-  env:
-    ANSIBLE_FILTER_PLUGINS: ${ANSIBLE_FILTER_PLUGINS:-./plugins/filter}
-    ANSIBLE_LIBRARY: ${ANSIBLE_LIBRARY:-./library}
-  log: False
-verifier:
-  name: testinfra

molecule/rocky8/prepare.yml

@@ -1,15 +0,0 @@
----
-- name: Prepare
-  hosts: all
-  gather_facts: false
-  tasks:
-    - name: Bootstrap python for Ansible
-      raw: |
-        command -v python3 python || (
-        (test -e /usr/bin/dnf && sudo dnf install -y python3) ||
-        (test -e /usr/bin/apt && (apt -y update && apt install -y python-minimal)) ||
-        (test -e /usr/bin/yum && sudo yum -y -qq install python3) ||
-        echo "Warning: Python not boostrapped due to unknown platform."
-        )
-      become: true
-      changed_when: false

pyproject.toml

@@ -0,0 +1,17 @@
+[tool.ruff]
+exclude = [".git", "__pycache__"]
+
+line-length = 99
+indent-width = 4
+
+[tool.ruff.lint]
+ignore = ["W191", "E111", "E114", "E117", "S101", "S105"]
+select = ["F", "E", "I", "W", "S"]
+
+[tool.ruff.format]
+quote-style = "double"
+indent-style = "space"
+line-ending = "lf"
+
+[tool.pytest.ini_options]
+filterwarnings = ["ignore::FutureWarning", "ignore::DeprecationWarning"]

setup.cfg

@@ -1,12 +0,0 @@
-[flake8]
-ignore = D100, D101, D102, D103, D105, D107, E402, W503
-max-line-length = 99
-inline-quotes = double
-exclude = .git,.tox,__pycache__,build,dist,tests,*.pyc,*.egg-info,.cache,.eggs,env*
-
-[yapf]
-based_on_style = google
-column_limit = 99
-dedent_closing_brackets = true
-coalesce_brackets = true
-split_before_logical_operator = true

tasks/main.yml

@@ -1,13 +1,114 @@
 ---
-- include_tasks: setup.yml
+- when: firewalld_enabled | bool
-  when: firewalld_enabled | bool
+  block:
+    - name: Install packages
+      ansible.builtin.package:
+        name: "{{ item }}"
+      loop:
+        - firewalld
+        - python3-firewall
+
+    - name: Configure firewalld
+      ansible.builtin.template:
+        src: etc/firewalld/firewalld.conf.j2
+        dest: /etc/firewalld/firewalld.conf
+        mode: "0644"
+      notify: __firewalld_reload
+
+    - name: Configure firewalld ipsets
+      ansible.builtin.template:
+        src: etc/firewalld/ipsets/ipset.xml.j2
+        dest: /etc/firewalld/ipsets/{{ item.name }}.xml
+        mode: "0640"
+      loop: "{{ __firewalld_ipsets }}"
+      loop_control:
+        label: "{{ item.name }}"
+      notify: __firewalld_reload
+
+    - name: Register active ipsets
+      ansible.builtin.find:
+        paths: /etc/firewalld/ipsets
+        file_type: file
+        patterns: "*.xml"
+      register: __firewalld_ipsets_active
+      changed_when: False
+      failed_when: False
+
+    - name: Remove unmanaged ipsets
+      ansible.builtin.file:
+        path: "{{ item }}"
+        state: absent
+      loop: "{{ __firewalld_ipsets_active.files | map(attribute='path') | list }}"
+      notify: __firewalld_reload
+      when: (item | basename | splitext | first) not in (__firewalld_ipsets | map(attribute='name') | list)
+
+    - name: Configure firewalld services
+      ansible.builtin.template:
+        src: etc/firewalld/services/service.xml.j2
+        dest: /etc/firewalld/services/{{ item.name }}.xml
+        mode: "0640"
+      loop: "{{ __firewalld_services }}"
+      loop_control:
+        label: "{{ item.name }}"
+      notify: __firewalld_reload
+
+    - name: Register active services
+      ansible.builtin.file:
+        paths: /etc/firewalld/services
+        file_type: file
+        patterns: "*.xml"
+      register: __firewalld_services_active
+      changed_when: False
+      failed_when: False
+
+    - name: Remove unmanaged services
+      ansible.builtin.file:
+        path: "{{ item }}"
+        state: absent
+      loop: "{{ __firewalld_services_active.files | map(attribute='path') | list }}"
+      notify: __firewalld_reload
+      when: (item | basename | splitext | first) not in (__firewalld_services | map(attribute='name') | list)
+
+    - name: Configure firewalld zones
+      ansible.builtin.template:
+        src: etc/firewalld/zones/zone.xml.j2
+        dest: /etc/firewalld/zones/{{ item.name }}.xml
+        mode: "0640"
+      loop: "{{ __firewalld_zones }}"
+      loop_control:
+        label: "{{ item.name }}"
+      when: item.name not in firewalld_zones_unmanaged
+      notify: __firewalld_reload
+
+    - name: Register active zones
+      ansible.builtin.file:
+        paths: /etc/firewalld/zones
+        file_type: file
+        patterns: "*.xml"
+      register: __firewalld_zones_active
+      changed_when: False
+      failed_when: False
+
+    - name: Remove unmanaged zones
+      ansible.builtin.file:
+        path: "{{ item }}"
+        state: absent
+      loop: "{{ __firewalld_zones_active.files | map(attribute='path') | list }}"
+      notify: __firewalld_reload
+      when:
+        - (item | basename | splitext | first) not in (__firewalld_zones | map(attribute='name') | list)
+        - (item | basename | splitext | first) not in firewalld_zones_unmanaged
+
+    - name: Validate deployed configuration
+      ansible.builtin.command: firewall-offline-cmd --check-config
+      register: __firewalld_check
+      changed_when: False
+      failed_when: __firewalld_check.rc != 0
 
 - name: Ensure service has expected state
-  service:
+  ansible.builtin.service:
     name: firewalld
     daemon_reload: True
     enabled: "{{ firewalld_enabled | bool }}"
     masked: "{{ not firewalld_enabled | bool }}"
     state: "{{ firewalld_enabled | bool | ternary('started', 'stopped', 'started') }}"
-  become: True
-  become_user: root

tasks/setup.yml

@@ -1,107 +0,0 @@
----
-- block:
-    - name: Install packages
-      package:
-        name: "{{ item }}"
-      loop:
-        - firewalld
-        - python3-firewall
-
-    - name: Configure firewalld
-      template:
-        src: etc/firewalld/firewalld.conf.j2
-        dest: /etc/firewalld/firewalld.conf
-        mode: 0644
-      notify: __firewalld_reload
-
-    - name: Configure firewalld ipsets
-      template:
-        src: etc/firewalld/ipsets/ipset.xml.j2
-        dest: /etc/firewalld/ipsets/{{ item.name }}.xml
-        mode: 0640
-      loop: "{{ __firewalld_ipsets }}"
-      loop_control:
-        label: "{{ item.name }}"
-      notify: __firewalld_reload
-
-    - name: Register active ipsets
-      find:
-        paths: /etc/firewalld/ipsets
-        file_type: file
-        patterns: "*.xml"
-      register: __firewalld_ipsets_active
-      changed_when: False
-      failed_when: False
-
-    - name: Remove unmanaged ipsets
-      file:
-        path: "{{ item }}"
-        state: absent
-      loop: "{{ __firewalld_ipsets_active.files | map(attribute='path') | list }}"
-      notify: __firewalld_reload
-      when: (item | basename | splitext | first) not in (__firewalld_ipsets | map(attribute='name') | list)
-
-    - name: Configure firewalld services
-      template:
-        src: etc/firewalld/services/service.xml.j2
-        dest: /etc/firewalld/services/{{ item.name }}.xml
-        mode: 0640
-      loop: "{{ __firewalld_services }}"
-      loop_control:
-        label: "{{ item.name }}"
-      notify: __firewalld_reload
-
-    - name: Register active services
-      find:
-        paths: /etc/firewalld/services
-        file_type: file
-        patterns: "*.xml"
-      register: __firewalld_services_active
-      changed_when: False
-      failed_when: False
-
-    - name: Remove unmanaged services
-      file:
-        path: "{{ item }}"
-        state: absent
-      loop: "{{ __firewalld_services_active.files | map(attribute='path') | list }}"
-      notify: __firewalld_reload
-      when: (item | basename | splitext | first) not in (__firewalld_services | map(attribute='name') | list)
-
-    - name: Configure firewalld zones
-      template:
-        src: etc/firewalld/zones/zone.xml.j2
-        dest: /etc/firewalld/zones/{{ item.name }}.xml
-        mode: 0640
-      loop: "{{ __firewalld_zones }}"
-      loop_control:
-        label: "{{ item.name }}"
-      when: item.name not in firewalld_zones_unmanaged
-      notify: __firewalld_reload
-
-    - name: Register active zones
-      find:
-        paths: /etc/firewalld/zones
-        file_type: file
-        patterns: "*.xml"
-      register: __firewalld_zones_active
-      changed_when: False
-      failed_when: False
-
-    - name: Remove unmanaged zones
-      file:
-        path: "{{ item }}"
-        state: absent
-      loop: "{{ __firewalld_zones_active.files | map(attribute='path') | list }}"
-      notify: __firewalld_reload
-      when:
-        - (item | basename | splitext | first) not in (__firewalld_zones | map(attribute='name') | list)
-        - (item | basename | splitext | first) not in firewalld_zones_unmanaged
-
-    - name: Validate deployed configuration
-      command: firewall-offline-cmd --check-config
-      register: __firewalld_check
-      changed_when: False
-      failed_when: __firewalld_check.rc != 0
-  become: True
-  become_user: root