From 353aae68e805fdf9b6818ccdc1497a68aa210c74 Mon Sep 17 00:00:00 2001 From: Simon Pirkelmann Date: Sun, 21 Mar 2021 18:23:21 +0100 Subject: [PATCH] new version of webinterface with improved admin support --- br_external/package/python-door-admin/door_admin.mk | 2 +- door_control | 2 +- root_overlay/bin/watcher | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/br_external/package/python-door-admin/door_admin.mk b/br_external/package/python-door-admin/door_admin.mk index 245de2e..578d139 100644 --- a/br_external/package/python-door-admin/door_admin.mk +++ b/br_external/package/python-door-admin/door_admin.mk @@ -1,4 +1,4 @@ -PYTHON_DOOR_ADMIN_VERSION = 0.0.3 +PYTHON_DOOR_ADMIN_VERSION = 0.0.5 PYTHON_DOOR_ADMIN_SOURCE = door_admin_v$(PYTHON_DOOR_ADMIN_VERSION).tar.gz PYTHON_DOOR_ADMIN_SITE = https://git.imaginaerraum.de/Telos4/DoorAdmin/archive PYTHON_DOOR_ADMIN_LICENSE = GPL-3.0 diff --git a/door_control b/door_control index 2efc234..4ac7e46 160000 --- a/door_control +++ b/door_control @@ -1 +1 @@ -Subproject commit 2efc2343b68a4b65dd239cbb0426074826d6f1b6 +Subproject commit 4ac7e46ca84de79556401130d45a4e4e39593537 diff --git a/root_overlay/bin/watcher b/root_overlay/bin/watcher index cf13ab5..33eacb2 100755 --- a/root_overlay/bin/watcher +++ b/root_overlay/bin/watcher @@ -2,5 +2,6 @@ while true; do start-stop-daemon -S -m -p /tmp/poll_desfire.pid -x /bin/poll_desfire -b -- /root/key /tmp/nfc_fifo start-stop-daemon -v -p /tmp/fcpy.pid -S -b -m -v -x /usr/bin/python -- /bin/door.py + start-stop-daemon -v -p /tmp/webiface.pid -S -b -m -v -x /usr/bin/python -- /usr/bin/launch_webadmin sleep 30 done