Merge branch 'master' of ssh://imaginaerraum.de:2201/Telos4/DoorAdmin

 Conflicts:

	app.py

	door_handle.py

	templates/register.html

Makefile

@@ -0,0 +1,24 @@
+VERSION ?= $(shell git rev-parse --short HEAD)
+
+release: door_admin_v$(VERSION).tar.gz
+
+TEMPLATE_FILES = $(shell find -name '*.html')
+STATIC_FILES = $(shell find -name '*.png' -o -name '*.js')
+PYTHON_FILES = $(shell find -name '*.py')
+ALL_FILES = $(TEMPLATE_FILES) $(STATIC_FILES) $(PYTHON_FILES)
+
+door_admin_v$(VERSION).tar.gz: Makefile $(ALL_FILES)
+	tar czf $@ --transform='s,^,door_admin_$(VERSION)/,' $^ 
+
+install: install_templates install_static install_python
+
+install_static:
+	install -D -m 0755 -t $(PREFIX)/usr/share/door_admin/static $(STATIC_FILES)
+
+install_templates:
+	install -D -m 0755 -t $(PREFIX)/usr/share/door_admin/templates $(TEMPLATE_FILES)
+
+install_python:
+	install -D -m 0755 -t $(PREFIX)/bin $(PYTHON_FILES)
+
+.PHONY: release install install_static install_templates install_python

app.py

@@ -267,4 +267,4 @@ def deactivate_token(token):
 
 
 if __name__ == '__main__':
-    app.run()
+    app.run(host='0.0.0.0')

door_tokens

@@ -1,7 +0,0 @@
-# token | name | organization | email | valid_thru
-04387cfa186280|David|test_org|d@d.de|
-#043a81fa186280|Nico|imaginaerraum||
-04538cfa186280|Simon|test_org|simon.pirkelmann@gmail.com|2021-03-07
-045e77fa186280|Valentin|test_org|v@v.de|
-#047378fa186280|Stephan|test_org|s@s.de|2021-03-07
-#047a76fa186280||||