From bb3a6332c75807865f4a62bc0662e8cc3797aa59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jesko=20Ansch=C3=BCtz?=
 <jesko@MacBook-Pro-von-Jesko-2.local>
Date: Sat, 1 Feb 2025 11:33:55 +0100
Subject: [PATCH] mqtt_variables angepasst

---
 roles/mqttDisplayClient/tasks/main.yml                    | 2 +-
 .../mqttDisplayClient/templates/mqttDisplayClient.ini.j2  | 8 ++++----
 roles/mqttDisplayClient/vars/main.yml                     | 7 +++----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/roles/mqttDisplayClient/tasks/main.yml b/roles/mqttDisplayClient/tasks/main.yml
index 56d48bb..a6e3d7a 100644
--- a/roles/mqttDisplayClient/tasks/main.yml
+++ b/roles/mqttDisplayClient/tasks/main.yml
@@ -43,6 +43,6 @@
     name: "Autogui-Befehl ausführen"
     minute: "*"
     user: "{{ raspi_user }}"
-    job: '/usr/bin/mosquitto_pub -h "{{ broker }}" -t "kiosk/01/{{ deviceName }}/autogui/set" -u "{{ username }}" -P "{{ password }}" -m "click(1895,52)"; sleep 1; /usr/bin/mosquitto_pub -h "{{ broker }}" -t "kiosk/01/{{ deviceName }}/autogui/set" -u "{{ username }}" -P "{{ password }}" -m "click(1920,1080)"'
+    job: '/usr/bin/mosquitto_pub -h "{{ mqtt_broker }}" -t "kiosk/01/{{ deviceName }}/autogui/set" -u "{{ mqtt_username }}" -P "{{ password }}" -m "click(1895,52)"; sleep 1; /usr/bin/mosquitto_pub -h "{{ mqtt_broker }}" -t "kiosk/01/{{ deviceName }}/autogui/set" -u "{{ mqtt_username }}" -P "{{ password }}" -m "click(1920,1080)"'
     state: present
   when: enableMQTTFeature and enableMQTTcronjob
diff --git a/roles/mqttDisplayClient/templates/mqttDisplayClient.ini.j2 b/roles/mqttDisplayClient/templates/mqttDisplayClient.ini.j2
index 38e28cd..611204c 100644
--- a/roles/mqttDisplayClient/templates/mqttDisplayClient.ini.j2
+++ b/roles/mqttDisplayClient/templates/mqttDisplayClient.ini.j2
@@ -16,10 +16,10 @@
 #
 [global]
 #set server ip adress and port
-broker={{ broker }}
-port={{ port }}
+broker={{ mqtt_broker }}
+port={{ mqtt_port }}
 #set username and password if needed:
-username={{ username }}
+username={{ mqtt_username }}
 password={{ password }}
 #change display ID 10-0045 to the value which you see in your system: ls /sys/class/backlight:
 displayID=10-0045
@@ -46,7 +46,7 @@ pyautogui=enabled
 #feature backlight alows you to control the brigtness off directly connected original raspberry pi displays like Touch Display 2
 #Disable this feature if you are not sure if your display support this feature! This avoids errors during startup. 
 backlight=enabled
-#enable home assitant auto discovery
+#enable home assistant auto discovery
 haDiscover=
 
 [brightness]
diff --git a/roles/mqttDisplayClient/vars/main.yml b/roles/mqttDisplayClient/vars/main.yml
index 257049d..64c7fd8 100644
--- a/roles/mqttDisplayClient/vars/main.yml
+++ b/roles/mqttDisplayClient/vars/main.yml
@@ -4,10 +4,9 @@
 #### 
 #### ~# ansible-vault encrypt_string 'meinSicheresPasswort' --name 'password'
 #### 
-raspinutzer: "{{ remote_user }}"
-broker: "dockerbox.morz.de"
-port: 1883
-username: "morz"
+mqtt_broker: "dockerbox.morz.de"
+mqtt_port: 1883
+mqtt_username: "morz"
 password: !vault |
           $ANSIBLE_VAULT;1.1;AES256
           36626464646239306132346130646564373263356231303266326463353261666463356461336634