From a1d1351411566a8cde61cac13a473907a7a47dc6 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Mon, 30 Sep 2024 22:24:34 +0200 Subject: [PATCH] update infobeamer-cms to current version --- bundles/infobeamer-cms/items.py | 10 +--------- nodes/voc/infobeamer-cms.py | 11 ++++++----- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/bundles/infobeamer-cms/items.py b/bundles/infobeamer-cms/items.py index 2d2f8c0..aa424a1 100644 --- a/bundles/infobeamer-cms/items.py +++ b/bundles/infobeamer-cms/items.py @@ -23,7 +23,7 @@ actions = { git_deploy = { '/opt/infobeamer-cms/src': { 'rev': 'master', - 'repo': 'https://github.com/sophieschi/36c3-cms.git', + 'repo': 'https://github.com/voc/infobeamer-cms.git', 'needs': { 'directory:/opt/infobeamer-cms/src', }, @@ -96,14 +96,6 @@ files = { }, } -pkg_pip = { - 'github-flask': { - 'needed_by': { - 'svc_systemd:infobeamer-cms', - }, - }, -} - svc_systemd = { 'infobeamer-cms': { 'needs': { diff --git a/nodes/voc/infobeamer-cms.py b/nodes/voc/infobeamer-cms.py index 77c21c4..9e38edc 100644 --- a/nodes/voc/infobeamer-cms.py +++ b/nodes/voc/infobeamer-cms.py @@ -39,11 +39,6 @@ nodes['voc.infobeamer-cms'] = { 'GITHUB_CLIENT_SECRET': vault.decrypt('encrypt$gAAAAABiNwHtdZC2XQ8IjosL7vsmrxZMwDIM6AD5dUlLo996tJs4qV7KJETHgYYZil2aMzClwhcE6JmxdhARRp7IJQ4rQQibelTNmyYSzj_V4puVpvma7SU0UZkTIG95SdPpoHY--Zba'), 'HOSTED_API_KEY': vault.decrypt('encrypt$gAAAAABhxJPH2sIGMAibU2Us1HoCVlNfF0SQQnVl0eiod48Zu8webL_-xk3wDw3yXw1Hkglj-2usl-D3Yd095yTSq0vZMCv2fh-JWwSPdJewQ45x9Ai4vXVD4CNz5vuJBESKS9xQWXTc'), 'INTERRUPT_KEY': vault.human_password_for('infobeamer-cms interrupt key'), - 'MQTT_MESSAGE': '{{"level":"info","component":"infobeamer-cms","msg":"{asset} uploaded by {user}. Check it at {url}"}}', - 'MQTT_PASSWORD': vault.decrypt('encrypt$gAAAAABhxakfhhwWn0vxhoO1FiMEpdCkomWvo0dHIuBrqDKav8WDpI6dXpb0hoXiWRsPV6p5m-8RlbfFbjPhz47AY-nFOOAAW6Yis3-IVD-U-InKJo9dvms='), - 'MQTT_SERVER': 'mqtt.c3voc.de', - 'MQTT_TOPIC': '/voc/alert', - 'MQTT_USERNAME': vault.decrypt('encrypt$gAAAAABhxakKHC_kHmHP2mFHorb4niuNTH4F24w1D6m5JUxl117N7znlZA6fpMmY3_NcmBr2Ihw4hL3FjZr9Fm_1oUZ1ZQdADA=='), 'SETUP_IDS': [ 250294, ], @@ -56,6 +51,12 @@ nodes['voc.infobeamer-cms'] = { # 'x2': 110, # 'y2': 1070, # }], + 'NOTIFIER': { + 'MQTT_PASSWORD': vault.decrypt('encrypt$gAAAAABhxakfhhwWn0vxhoO1FiMEpdCkomWvo0dHIuBrqDKav8WDpI6dXpb0hoXiWRsPV6p5m-8RlbfFbjPhz47AY-nFOOAAW6Yis3-IVD-U-InKJo9dvms='), + 'MQTT_SERVER': 'mqtt.c3voc.de', + 'MQTT_TOPIC': '/voc/alert', + 'MQTT_USERNAME': vault.decrypt('encrypt$gAAAAABhxakKHC_kHmHP2mFHorb4niuNTH4F24w1D6m5JUxl117N7znlZA6fpMmY3_NcmBr2Ihw4hL3FjZr9Fm_1oUZ1ZQdADA=='), + }, }, 'rooms': { 'Saal 1': 34430,