fix: adapt when condition

.ansible-lint

@@ -1,3 +1,4 @@
 ---
 
-skip_list: []
+exclude_paths:
+- .gitea/

.drone.yml

@@ -1,94 +0,0 @@
----
-kind: pipeline
-type: kubernetes
-name: linter
-
-platform:
-  os: linux
-
-steps:
-- name: markdown lint
-  commands:
-  - markdownlint *.md
-  image: docker.io/volkerraschek/markdownlint:0.31.1
-  resources:
-    limits:
-      cpu: 50
-      memory: 50M
-
-- name: email-notification
-  environment:
-    PLUGIN_HOST:
-      from_secret: smtp_host
-    PLUGIN_USERNAME:
-      from_secret: smtp_username
-    PLUGIN_PASSWORD:
-      from_secret: smtp_password
-    PLUGIN_FROM:
-      from_secret: smtp_mail_address
-  image: docker.io/drillster/drone-email:latest
-  resources:
-    limits:
-      cpu: 50
-      memory: 25M
-  when:
-    status:
-    - changed
-    - failure
-
-trigger:
-  event:
-    exclude:
-    - tag
-
----
-kind: pipeline
-type: kubernetes
-name: sync
-
-platform:
-  os: linux
-  arch: amd64
-
-steps:
-- name: github
-  image: docker.io/appleboy/drone-git-push:latest
-  resources:
-    limits:
-      cpu: 50
-      memory: 25M
-  settings:
-    branch: master
-    remote: ssh://git@github.com/volker-raschek/networking-role.git
-    force: true
-    ssh_key:
-      from_secret: ssh_key
-
-- name: email-notification
-  environment:
-    PLUGIN_HOST:
-      from_secret: smtp_host
-    PLUGIN_USERNAME:
-      from_secret: smtp_username
-    PLUGIN_PASSWORD:
-      from_secret: smtp_password
-    PLUGIN_FROM:
-      from_secret: smtp_mail_address
-  image: docker.io/drillster/drone-email:latest
-  resources:
-    limits:
-      cpu: 50
-      memory: 25M
-  when:
-    status:
-    - changed
-    - failure
-
-trigger:
-  branch:
-  - master
-  event:
-  - cron
-  - push
-  repo:
-  - volker.raschek/networking-role

.gitea/workflows/ansible-linters.yaml

@@ -0,0 +1,20 @@
+name: Ansible Linter
+
+on:
+  pull_request:
+    types: [ "opened", "reopened", "synchronize" ]
+  push:
+    branches: [ '**' ]
+    tags-ignore: [ '**' ]
+
+jobs:
+  ansible-lint:
+    runs-on:
+    - ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Run ansible-lint
+      uses: ansible/ansible-lint@v25.7.0
+      with:
+        args: "--config-file .ansible-lint"
+        setup_python: "true"

.gitea/workflows/markdown-linters.yaml

@@ -0,0 +1,18 @@
+name: Lint Markdown files
+
+on:
+  pull_request:
+    types: [ "opened", "reopened", "synchronize" ]
+  push:
+    branches: [ '**' ]
+    tags-ignore: [ '**' ]
+
+jobs:
+  markdown-lint:
+    runs-on:
+    - ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4.2.2
+    - uses: DavidAnson/markdownlint-cli2-action@v20.0.0
+      with:
+        globs: '**/*.md'

.gitignore

@@ -0,0 +1 @@
+.ansible

.markdownlint.yaml

@@ -45,19 +45,17 @@ MD012:
 # MD013/line-length - Line length
 MD013:
   # Number of characters
-  line_length: 80
+  line_length: 120
   # Number of characters for headings
-  heading_line_length: 80
+  heading_line_length: 120
   # Number of characters for code blocks
-  code_block_line_length: 80
+  code_block_line_length: 120
   # Include code blocks
   code_blocks: false
   # Include tables
   tables: false
   # Include headings
   headings: true
-  # Include headings
-  headers: true
   # Strict length checking
   strict: false
   # Stern length checking
@@ -70,11 +68,6 @@ MD022:
   # Blank lines below heading
   lines_below: 1
 
-# MD024/no-duplicate-heading/no-duplicate-header - Multiple headings with the same content
-MD024:
-  # Only check sibling headings
-  allow_different_nesting: true
-
 # MD025/single-title/single-h1 - Multiple top-level headings in the same document
 MD025:
   # Heading level
@@ -141,4 +134,4 @@ MD046:
 # MD048/code-fence-style - Code fence style
 MD048:
   # Code fence syle
-  style: "backtick"
+  style: "backtick"

.yamllint.yaml

@@ -0,0 +1,17 @@
+#
+# Documentation:
+# https://yamllint.readthedocs.io/en/stable/
+#
+
+rules:
+  brackets:
+    forbid: false
+    min-spaces-inside: 0
+    max-spaces-inside: 2
+    min-spaces-inside-empty: 0
+    max-spaces-inside-empty: 0
+  indentation:
+    spaces: 2
+    indent-sequences: false
+  line-length:
+    max: 360

README.md

@@ -1,7 +1,6 @@
 # networking
 
-[![Build Status](https://drone.cryptic.systems/api/badges/volker.raschek/networking-role/status.svg)](https://drone.cryptic.systems/volker.raschek/networking-role)
+[![Ansible Role](https://img.shields.io/ansible/role/d/58433)](https://galaxy.ansible.com/volker_raschek/networking)
-[![Ansible Role](https://img.shields.io/ansible/role/d/58433)](https://galaxy.ansible.com/volker_raschek/networking_role)
 
 With following role can the networking stack provided by systemd be configured.
 

defaults/main.yml

@@ -109,4 +109,4 @@ systemd_networkd_network: []
 #       value: "192.168.178.100"
 #   filename: "50-wireguard.network"
 
-systemd_timesyncd_timezone: Europe/Berlin
+systemd_timesyncd_timezone: Europe/Berlin

handlers/main.yml

@@ -1,7 +1,7 @@
 ---
 
-- name: restart networkd
+- name: Restart networkd
-  systemd:
+  ansible.builtin.systemd:
     name: "{{ item }}"
     state: restarted
     daemon_reload: true

meta/main.yml

@@ -1,24 +1,22 @@
+dependencies: []
 galaxy_info:
-  role_name: networking
   author: Markus Pesch
-  description: Role to configure network interfaces via systemd on different distributions
   company: Cryptic Systems
+  description: Role to configure network interfaces via systemd on different distributions
   license: MIT
   min_ansible_version: "2.9"
+  namespace: volker-raschek
   platforms:
   - name: ArchLinux
     versions:
     - all
+  - name: EL
+    versions:
+    - all
+  - name: Fedora
+    versions:
+    - all
   - name: Ubuntu
     versions:
     - all
-  - name: Fedora
+  role_name: networking
-    versions:
-    - "35"
-
-  galaxy_tags:
-  - systemd-networkd
-  - wiregurd
-  - resolvectl
-
-dependencies: []

renovate.json

@@ -1,17 +1,9 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "assignees": [ "volker.raschek" ],
+  "extends": [
-  "automergeStrategy": "merge-commit",
+    "local>volker.raschek/renovate-config:default#master",
-  "automergeType": "pr",
+    "local>volker.raschek/renovate-config:container#master",
-  "labels": [ "renovate" ],
+    "local>volker.raschek/renovate-config:actions#master",
-  "packageRules": [
+    "local>volker.raschek/renovate-config:regexp#master"
-    {
+  ]
-      "addLabels": [ "renovate/droneci", "renovate/automerge" ],
+}
-      "automerge": true,
-      "matchManagers": "droneci",
-      "matchUpdateTypes": [ "minor", "patch"]
-    }
-  ],
-  "rebaseLabel": "renovate/rebase",
-  "rebaseWhen": "behind-base-branch"
-}

tasks/main.yml

@@ -1,90 +1,89 @@
 ---
 
-- name: Load variables
+- name: "Include OS-specific variables"
-  include_vars: "{{ ansible_os_family }}.yml"
+  ansible.builtin.include_vars: "{{ ansible_os_family }}.yml"
 
 - name: "Remove existing systemd-networkd configuration"
-  file:
+  ansible.builtin.file:
     path: "/etc/systemd/network"
     state: absent
 
 - name: "Create systemd-networkd directory"
-  file:
+  ansible.builtin.file:
     path: "/etc/systemd/network"
     owner: root
     group: root
-    mode: 0755
+    mode: "0755"
     state: directory
 
 - name: Create systemd.netdev files
   block:
   - name: Create systemd.netdev files
-    template:
+    ansible.builtin.template:
       src: systemd.netdev.j2
       dest: "/etc/systemd/network/{{ item.filename }}"
       owner: "{{ systemd_networkd_unix_user }}"
       group: "{{ systemd_networkd_unix_user }}"
-      mode: 0644
+      mode: "0644"
-    when: item.netdev_options is defined and
+    when:
-          item.netdev_options | selectattr("key", "==", "Kind") and
+      item.netdev_options is defined and
-          item.netdev_options | selectattr("value", "!=", "wireguard")
+      (item.netdev_options | selectattr('key', 'equalto', 'Kind') | map(attribute='value') | first) != 'wireguard'
     with_items: "{{ systemd_networkd_netdev }}"
 
   - name: Create sensitive systemd.netdev files
-    template:
+    ansible.builtin.template:
       src: systemd.netdev.j2
       dest: "/etc/systemd/network/{{ item.filename }}"
       owner: "{{ systemd_networkd_unix_user }}"
       group: "{{ systemd_networkd_unix_user }}"
-      mode: 0600
+      mode: "0600"
     when: item.netdev_options is defined and
-          item.netdev_options | selectattr("key", "equalto", "Kind") and
+          (item.netdev_options | selectattr('key', 'equalto', 'Kind') | map(attribute='value') | first) == 'wireguard'
-          item.netdev_options | selectattr("value", "equalto", "wireguard")
     with_items: "{{ systemd_networkd_netdev }}"
     no_log: true
-    notify: restart networkd
+    notify: Restart networkd
 
 - name: Create systemd.networkd files
-  template:
+  ansible.builtin.template:
     src: systemd.network.j2
     dest: "/etc/systemd/network/{{ item.filename }}"
     owner: "{{ systemd_networkd_unix_user }}"
     group: "{{ systemd_networkd_unix_user }}"
-    mode: 0644
+    mode: "0644"
   with_items: "{{ systemd_networkd_network }}"
-  notify: restart networkd
+  notify: Restart networkd
 
 - name: Create symlink to use systemd-resolved's stub-listener
-  file:
+  ansible.builtin.file:
     src: /run/systemd/resolve/stub-resolv.conf
     dest: /etc/resolv.conf
     state: link
-    force: yes
+    force: true
-    follow: no
+    follow: false
     owner: root
     group: root
 
 - name: Start and enable systemd-networkd
-  service:
+  ansible.builtin.systemd:
     name: systemd-networkd
     state: started
-    enabled: yes
+    enabled: true
-    daemon_reload: yes
+    daemon_reload: true
 
 - name: Start and enable systemd-resolved
-  service:
+  ansible.builtin.systemd:
     name: systemd-resolved
     state: started
-    enabled: yes
+    enabled: true
-    daemon_reload: yes
+    daemon_reload: true
 
 - name: Set system timezone
-  timezone:
+  community.general.timezone:
     name: "{{ systemd_timesyncd_timezone }}"
 
 - name: Start and enable systemd-timesyncd
-  service:
+  ansible.builtin.systemd:
     name: systemd-timesyncd
     state: started
-    enabled: yes
+    enabled: true
-    daemon_reload: yes
+    daemon_reload: true

templates/systemd.netdev.j2

@@ -1,4 +1,4 @@
-#jinja2: lstrip_blocks: "True", trim_blocks: "True"
+#jinja2: lstrip_blocks: True
 #
 # {{ ansible_managed }}
 #

templates/systemd.network.j2

@@ -1,4 +1,4 @@
-#jinja2: lstrip_blocks: "True", trim_blocks: "True"
+#jinja2: lstrip_blocks: True
 #
 # {{ ansible_managed }}
 #

vars/Archlinux.yml

@@ -1,4 +1,4 @@
 ---
 
 systemd_networkd_unix_user: systemd-network
-systemd_networkd_unix_group: systemd-network
+systemd_networkd_unix_group: systemd-network

vars/Debian.yml

@@ -1,4 +1,4 @@
 ---
 
 systemd_networkd_unix_user: systemd-network
-systemd_networkd_unix_group: systemd-network
+systemd_networkd_unix_group: systemd-network

vars/RedHat.yml

@@ -3,4 +3,4 @@
 systemd_networkd_unix_user: systemd-network
 systemd_networkd_unix_group: systemd-network
 
-systemd_networkd_package_names: []
+systemd_networkd_package_names: []