apo/DoorPi
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: apo:d266d178ee1258e95256e310c83b6cb7d6a1e585
Branches Tags
apo:main
apo:new-webinterface
apo:devel-webiface
...
compare: apo:1478e6fdb138531ae3b3e950d888d3786751df6d
Branches Tags
apo:main
apo:new-webinterface
apo:devel-webiface

2 Commits
d266d178ee ... 1478e6fdb1

Author SHA1 Message Date
Simon Pirkelmann
1478e6fdb1 Merge branch 'main' of ssh://imaginaerraum.de:2201/apo/DoorPi into main 2021-03-21 18:23:32 +01:00
Simon Pirkelmann
353aae68e8 new version of webinterface with improved admin support 2021-03-21 18:23:21 +01:00
3 changed files with 3 additions and 2 deletions
Show Stats Expand all files Collapse all files

2
br_external/package/python-door-admin/door_admin.mk
View File

@ -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_SOURCE = door_admin_v$(PYTHON_DOOR_ADMIN_VERSION).tar.gz
PYTHON_DOOR_ADMIN_SITE = https://git.imaginaerraum.de/Telos4/DoorAdmin/archive PYTHON_DOOR_ADMIN_SITE = https://git.imaginaerraum.de/Telos4/DoorAdmin/archive
PYTHON_DOOR_ADMIN_LICENSE = GPL-3.0 PYTHON_DOOR_ADMIN_LICENSE = GPL-3.0

2
door_control

@ -1 +1 @@
Subproject commit 2efc2343b68a4b65dd239cbb0426074826d6f1b6 Subproject commit 4ac7e46ca84de79556401130d45a4e4e39593537

1
root_overlay/bin/watcher
View File

@ -2,5 +2,6 @@
while true; do 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 -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/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 sleep 30
done done