upgrade mqtt broker

intern/docker_mqtt/tasks/main.yml

 ---
 - include: ../functions/get_secret.yml
   with_items:
-   - { path: /srv/mqtt/influxdb_password, length: 12 }
-   - { path: /srv/mqtt/influxdb_token, length: 24 }
+   - { path: "{{ basedir }}/influxdb_password", length: 12 }
+   - { path: "{{ basedir }}/influxdb_token", length: 24 }
 
-- name: create folder struct for mqtt
+- name: "create folder struct for {{ servicename }}"
   file: 
     path: "{{ item }}"
     state: "directory"
   with_items:
-    - /srv/mqtt/
-    - /srv/mqtt/data/
-    - /srv/mqtt/log/
-    - /srv/mqtt/influxdb-data/
-    - /srv/mqtt/influxdb-conf/
+    - "{{ basedir }}"
+    - "{{ basedir }}/data/"
+    - "{{ basedir }}/log/"
+    - "{{ basedir }}/influxdb-data/"
+    - "{{ basedir }}/influxdb-conf/"
 
-- name: create config files
-  template: src={{ item }} dest=/srv/mqtt/{{ item }}
+- name: "create {{ servicename }} config files"
+  template: 
+    src: "{{ item }}" 
+    dest: "{{ basedir }}/{{ item }}"
   with_items: 
     - docker-compose.yml
+    - mosquitto.conf
     - telegraf.conf
 
-- name: start mqtt docker
+- name: "start {{ servicename }} docker"
   docker_compose:
-    project_src: /srv/mqtt/
+    project_src: "{{ basedir }}"
     state: present
 

intern/docker_mqtt/templates/docker-compose.yml

@@ -4,25 +4,25 @@ services:
 
   app:
 
-    image: eclipse-mosquitto:1.6.12
+    image: eclipse-mosquitto:2.0.15
     restart: always
     ports:
-      - 1883:1883 
-      - 9001:9001
+      - "{{mqtt_port}}:1883" 
     volumes:
-      - /srv/mqtt/data:/mosquitto/data
-      - /srv/mqtt/log:/mosquitto/log
+      - {{ basedir }}/mosquitto.conf:/mosquitto/config/mosquitto.conf
+      - {{ basedir }}/data:/mosquitto/data
+      - {{ basedir }}/log:/mosquitto/log
 
 
   influxdb:
 
-    image: influxdb:2.0.9
+    image: influxdb:2.5.0
     restart: always
     ports:
       - {{ int_ip4 }}:{{ influxdb_port }}:8086
     volumes:
-      - /srv/mqtt/influxdb-data:/var/lib/influxdb2
-      - /srv/mqtt/influxdb-conf:/etc/influxdb2
+      - {{ basedir }}/influxdb-data:/var/lib/influxdb2
+      - {{ basedir }}/influxdb-conf:/etc/influxdb2
     environment:
       DOCKER_INFLUXDB_INIT_MODE: setup
       DOCKER_INFLUXDB_INIT_USERNAME: mqtt
@@ -31,12 +31,13 @@ services:
       DOCKER_INFLUXDB_INIT_BUCKET: mqtt
       DOCKER_INFLUXDB_INIT_ADMIN_TOKEN: {{ influxdb_token }}
 
+
   telegraf:
 
-    image: telegraf:1.20.3
+    image: telegraf:1.22.4
     restart: always
     depends_on: 
       - app
       - influxdb
     volumes:
-      - /srv/mqtt/telegraf.conf:/etc/telegraf/telegraf.conf:ro
+      - {{ basedir }}/telegraf.conf:/etc/telegraf/telegraf.conf:ro

intern/docker_mqtt/templates/mosquitto.conf

+
+listener {{ mqtt_port }}
+
+allow_anonymous true
+
+persistence true
+persistence_location /mosquitto/data/

site.yml

@@ -52,9 +52,10 @@
         basedir: /srv/heimdall 
       }
     - { 
-        role: intern/docker_mqtt, 
-        tags: mqtt, 
+        role: intern/docker_mqtt,   tags: mqtt, 
         servicename: mqtt,
+        basedir: /srv/mqtt, 
+        mqtt_port: 1883,
         influxdb_port: 18086
       }
     - {