[skip ci] fix drone-matrix template

.drone.jsonnet

@@ -15,18 +15,18 @@ local PipelineLinting = {
     },
     {
       name: 'python-format',
-      image: 'python:3.9',
+      image: 'python:3.11',
       environment: {
         PY_COLORS: 1,
       },
       commands: [
         'pip install -qq yapf',
-        '[ -z "$(find .  -type f -name *.py)" ] || (yapf -rd ./)',
+        '[ -z "$(find . -type f -name *.py)" ] || (yapf -rd ./)',
       ],
     },
     {
       name: 'python-flake8',
-      image: 'python:3.9',
+      image: 'python:3.11',
       environment: {
         PY_COLORS: 1,
       },
@@ -37,7 +37,7 @@ local PipelineLinting = {
     },
   ],
   trigger: {
-    ref: ['refs/heads/master', 'refs/tags/**', 'refs/pull/**'],
+    ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'],
   },
 };
 
@@ -58,7 +58,7 @@ local PipelineDeployment(scenario='centos7') = {
   steps: [
     {
       name: 'ansible-molecule',
-      image: 'thegeeklab/molecule:3',
+      image: 'thegeeklab/molecule:4',
       environment: {
         HCLOUD_TOKEN: { from_secret: 'hcloud_token' },
       },
@@ -71,7 +71,7 @@ local PipelineDeployment(scenario='centos7') = {
     'linting',
   ],
   trigger: {
-    ref: ['refs/heads/master', 'refs/tags/**'],
+    ref: ['refs/heads/main', 'refs/tags/**'],
   },
 };
 
@@ -107,12 +107,12 @@ local PipelineDocumentation = {
         target_branch: 'docs',
       },
       when: {
-        ref: ['refs/heads/master'],
+        ref: ['refs/heads/main'],
       },
     },
   ],
   trigger: {
-    ref: ['refs/heads/master', 'refs/tags/**', 'refs/pull/**'],
+    ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'],
   },
   depends_on: [
     'testing-centos7',
@@ -136,7 +136,7 @@ local PipelineNotification = {
       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 }}){{/if}} by {{ commit.Author }}<br/> Message: {{ commit.Message.Title }}',
+        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' },
       },
@@ -147,7 +147,7 @@ local PipelineNotification = {
   ],
   trigger: {
     status: ['success', 'failure'],
-    ref: ['refs/heads/master', 'refs/tags/**'],
+    ref: ['refs/heads/main', 'refs/tags/**'],
   },
 };
 

.drone.yml

@@ -13,15 +13,15 @@ steps:
       - ansible-later
 
   - name: python-format
-    image: python:3.9
+    image: python:3.11
     commands:
       - pip install -qq yapf
-      - "[ -z \"$(find .  -type f -name *.py)\" ] || (yapf -rd ./)"
+      - "[ -z \"$(find . -type f -name *.py)\" ] || (yapf -rd ./)"
     environment:
       PY_COLORS: 1
 
   - name: python-flake8
-    image: python:3.9
+    image: python:3.11
     commands:
       - pip install -qq flake8
       - flake8
@@ -30,7 +30,7 @@ steps:
 
 trigger:
   ref:
-    - refs/heads/master
+    - refs/heads/main
     - refs/tags/**
     - refs/pull/**
 
@@ -51,7 +51,7 @@ workspace:
 
 steps:
   - name: ansible-molecule
-    image: thegeeklab/molecule:3
+    image: thegeeklab/molecule:4
     commands:
       - molecule test -s centos7
     environment:
@@ -60,7 +60,7 @@ steps:
 
 trigger:
   ref:
-    - refs/heads/master
+    - refs/heads/main
     - refs/tags/**
 
 depends_on:
@@ -98,11 +98,11 @@ steps:
         from_secret: gitea_username
     when:
       ref:
-        - refs/heads/master
+        - refs/heads/main
 
 trigger:
   ref:
-    - refs/heads/master
+    - refs/heads/main
     - refs/tags/**
     - refs/pull/**
 
@@ -130,13 +130,13 @@ steps:
         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 }}){{/if}} by {{ commit.Author }}<br/> Message: {{ commit.Message.Title }}"
+      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/master
+    - refs/heads/main
     - refs/tags/**
   status:
     - success
@@ -147,6 +147,6 @@ depends_on:
 
 ---
 kind: signature
-hmac: cf0e9ecc6404b1687b91565f6f90bbf34bc232dae83b6248855a7027f4df66fc
+hmac: 8deae8ced5d7f9c3945e28632266d5573cf0ce26d1a21b1e494e34128c05e2a1
 
 ...

.gitignore

@@ -9,3 +9,5 @@ __pycache__/
 *.py[cod]
 *$py.class
 
+# ---> Docs
+/_docs

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Robert Kaussow <mail@thegeeklab.de>
+Copyright (c) 2022 Robert Kaussow <mail@thegeeklab.de>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

defaults/main.yml

@@ -92,6 +92,8 @@ zigbee2mqtt_elapsed: False
 
 zigbee2mqtt_homeassistant_discovery_topic: homeassistant
 zigbee2mqtt_homeassistant_status_topic: "hass/status"
+zigbee2mqtt_homeassistant_legacy_entity_attributes: False
+zigbee2mqtt_homeassistant_legacy_triggers: False
 
 zigbee2mqtt_devices_ban: []
 zigbee2mqtt_devices_whitelist: []

meta/main.yml

@@ -8,7 +8,7 @@ galaxy_info:
   # @meta description: >
   # [![Source Code](https://img.shields.io/badge/gitea-source%20code-blue?logo=gitea&logoColor=white)](https://gitea.rknet.org/ansible/xoxys.zigbee2mqtt)
   # [![Build Status](https://img.shields.io/drone/build/ansible/xoxys.zigbee2mqtt?logo=drone&server=https%3A%2F%2Fdrone.rknet.org)](https://drone.rknet.org/ansible/xoxys.zigbee2mqtt)
-  # [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://gitea.rknet.org/ansible/xoxys.zigbee2mqtt/src/branch/master/LICENSE)
+  # [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://gitea.rknet.org/ansible/xoxys.zigbee2mqtt/src/branch/main/LICENSE)
   #
   # Setup [zigbee2mqtt](https://github.com/Koenkk/zigbee2mqtt). Zigbee2mqtt allows you to use your
   # Zigbee devices without the vendors bridge or gateway. It bridges events and allows you to control

molecule/requirements.yml

@@ -7,9 +7,9 @@ roles:
   - src: https://gitea.rknet.org/ansible/xoxys.docker_engine.git
     name: xoxys.docker_engine
     scm: git
-    version: master
+    version: main
 
   - src: https://gitea.rknet.org/ansible/xoxys.mosquitto.git
     name: xoxys.mosquitto
     scm: git
-    version: master
+    version: main

templates/zigbee2mqtt/data/configuration.yaml.j2

@@ -1,9 +1,16 @@
 #jinja2:lstrip_blocks: True
 ---
 {{ ansible_managed | comment }}
-homeassistant: {{ zigbee2mqtt_homeassistant_enabled }}
 permit_join: {{ zigbee2mqtt_permit_join }}
+{% if zigbee2mqtt_homeassistant_enabled | bool %}
 
+homeassistant:
+  discovery_topic: "{{ zigbee2mqtt_homeassistant_discovery_topic }}"
+  status_topic: "{{ zigbee2mqtt_homeassistant_status_topic }}"
+  legacy_entity_attributes: {{ zigbee2mqtt_homeassistant_legacy_entity_attributes | bool }}
+  legacy_triggers: {{ zigbee2mqtt_homeassistant_legacy_triggers | bool }}
+
+{% endif %}
 mqtt:
   base_topic: "{{ zigbee2mqtt_mqtt_base_topic }}"
   server: "{{ zigbee2mqtt_mqtt_server }}"
@@ -40,21 +47,19 @@ whitelist:
 advanced:
   pan_id: {{ zigbee2mqtt_pan_id }}
   ext_pan_id: {{ zigbee2mqtt_ext_pan_id }}
-  channel: {{ zigbee2mqtt_channel }}
-  cache_state: {{ zigbee2mqtt_cache_state }}
-  log_level: "{{ zigbee2mqtt_log_level }}"
   {% if zigbee2mqtt_network_key is defined and zigbee2mqtt_network_key %}
   network_key: {{ zigbee2mqtt_network_key }}
   {% endif %}
+  channel: {{ zigbee2mqtt_channel }}
+  cache_state: {{ zigbee2mqtt_cache_state }}
+  log_level: "{{ zigbee2mqtt_log_level }}"
   last_seen: "{{ zigbee2mqtt_last_seen }}"
   elapsed: {{ zigbee2mqtt_elapsed }}
-  homeassistant_discovery_topic: "{{ zigbee2mqtt_homeassistant_discovery_topic }}"
-  homeassistant_status_topic: "{{ zigbee2mqtt_homeassistant_status_topic }}"
-{% if zigbee2mqtt_device_options is defined %}
 
+{% if zigbee2mqtt_device_options is defined %}
 device_options:
   {{ zigbee2mqtt_device_options | to_nice_yaml | indent(2) }}
-{% endif %}
 
+{% endif %}
 devices: "devices.yaml"
 groups: "groups.yaml"