diff --git a/intern/docker_openhab/tasks/main.yml b/intern/docker_openhab/tasks/main.yml index 61b3194f41715237e092632495f39a2ffb7ebca4..1621efcef65b10c360d903d821ff2494badc835f 100644 --- a/intern/docker_openhab/tasks/main.yml +++ b/intern/docker_openhab/tasks/main.yml @@ -2,9 +2,10 @@ - include: ../functions/get_secret.yml with_items: - - { path: "{{ basedir }}/openweathermap_apikey", length: -1 } - - { path: "{{ basedir }}/influxdb_password", length: 12 } - - { path: "{{ basedir }}/influxdb_token", length: 32 } + - { path: "{{ basedir }}/openweathermap_apikey", length: -1 } + - { path: "{{ basedir }}/warpai_status_update_key", length: -1 } + - { path: "{{ basedir }}/influxdb_password", length: 12 } + - { path: "{{ basedir }}/influxdb_token", length: 32 } - name: pakete installieren diff --git a/intern/docker_openhab/templates/conf/rules/zonestatus.rules b/intern/docker_openhab/templates/conf/rules/zonestatus.rules index 3129b7ca3e4cb871c3516907655e546036e66811..3a7d2ec803444e88b0a2c21433a1cd7bf88ee13c 100644 --- a/intern/docker_openhab/templates/conf/rules/zonestatus.rules +++ b/intern/docker_openhab/templates/conf/rules/zonestatus.rules @@ -11,5 +11,8 @@ then val mqttActions = getActions("mqtt", "mqtt:broker:mosquitto") mqttActions.publishMQTT(topic, message) + val headers = newHashMap() + val output = sendHttpGetRequest("https://api.warpzone.ms/setstatus?newstatus=OPEN&update_key={{ warpai_status_update_key }}", headers, 1000) + end diff --git a/webserver/docker_warpapi/tasks/main.yml b/webserver/docker_warpapi/tasks/main.yml index a5ceec18267f807e94a8013f54f2ec43ff1d66fa..4de5b65c21b8bdae441eed2f773f26631be34c07 100644 --- a/webserver/docker_warpapi/tasks/main.yml +++ b/webserver/docker_warpapi/tasks/main.yml @@ -1,5 +1,9 @@ --- +- include_tasks: ../functions/get_secret.yml + with_items: + - { path: /srv/warpapi/update_key, length: 32 } + - name: create folder struct for warpapi file: path: "/srv/warpapi" @@ -8,7 +12,7 @@ - name: clone repo git: repo: "https://gitlab.warpzone.ms/infrastruktur/warpapi.git" - version: "232c44ed365998acf70f5c28510bcc663adc5686" + version: "fc3eea53b5bda24e0a46e7f88fdb296bdb871b10" dest: "/srv/warpapi" force: "yes" register: gitclone diff --git a/webserver/docker_warpapi/templates/docker-compose.yml b/webserver/docker_warpapi/templates/docker-compose.yml index d6e0e16feb73ae402b5a539dcff251500fd66ef0..e75908179941fe04a2f7072d68b942739a2c732b 100644 --- a/webserver/docker_warpapi/templates/docker-compose.yml +++ b/webserver/docker_warpapi/templates/docker-compose.yml @@ -11,6 +11,8 @@ services: - 127.0.0.1:42010:5000 volumes: - /srv/warpapi/warpapi/:/opt/warpapi + environment: + UPDATE_KEY: "{{ update_key }}" labels: - traefik.enable=true - traefik.http.routers.{{ servicename }}.rule=Host(`{{ domain }}`) diff --git a/webserver/docker_warpapi/templates/set_status_closed.sh b/webserver/docker_warpapi/templates/set_status_closed.sh index 5cac9d75f38de347890edd1e1db87c0f211663af..76fbe1a3dab72598534b0b34f903d09267121050 100644 --- a/webserver/docker_warpapi/templates/set_status_closed.sh +++ b/webserver/docker_warpapi/templates/set_status_closed.sh @@ -1,2 +1,2 @@ #!/bin/sh -docker run --rm -it ruimarinho/mosquitto mosquitto_pub -h 192.168.0.201 -t warpzone/door/status -m "CLOSED" --retain +curl "https://{{ domain }}/setstatus?newstatus=CLOSED&update_key={{ update_key }}" diff --git a/webserver/docker_warpapi/templates/set_status_open.sh b/webserver/docker_warpapi/templates/set_status_open.sh index 1058cc4dd0b4b247479e1fd91be63499a43aa96d..c6b8812e15a6e07935d5594cd3ce2b0692a0bde8 100644 --- a/webserver/docker_warpapi/templates/set_status_open.sh +++ b/webserver/docker_warpapi/templates/set_status_open.sh @@ -1,2 +1,2 @@ #!/bin/sh -docker run --rm -it ruimarinho/mosquitto mosquitto_pub -h 192.168.0.201 -t warpzone/door/status -m "OPEN" --retain +curl "https://{{ domain }}/setstatus?newstatus=OPEN&update_key={{ update_key }}"