Commit Graph

190 Commits

Author SHA1 Message Date
Ralf Ramsauer 9828534eae Config: Move SYSCONFDIR and PREFIX to Config
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2019-06-15 22:42:01 +02:00
Ralf Ramsauer 1e5f7c3ec4 Config: allow multiple config topics
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2019-06-15 22:42:01 +02:00
Ralf Ramsauer caab43f4d3 Introduce etc directory
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2019-06-15 22:41:59 +02:00
Thomas bdfcf29075 move Config class to pydoorlock module
Signed-off-by: Thomas Schmid <tom@binary-kitchen.de>
2019-06-14 22:01:33 +02:00
Ralf Ramsauer 209ccb3ba3 doorlockd: update copyright
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2019-02-22 20:13:32 +01:00
Ralf Ramsauer bc23a8c122 Take version from VERSION
Preparation for pip

Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-10-16 21:26:15 +02:00
Ralf Ramsauer 92b791a835 pydoorlock: doorlockd: make callbacks running again
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-10-16 21:25:51 +02:00
Ralf Ramsauer d6d90e9f70 doorlockd: move DoorHandler to Doorlock.py
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-10-16 21:25:40 +02:00
Ralf Ramsauer aa3369baa8 doorlockd: move all scripting stuff to DoorHandler
Use this chance to get rid of most global variables.

Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-10-16 21:25:37 +02:00
Ralf Ramsauer bb65e38640 doorlockd: make {static,templates}_folder local
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-10-16 21:25:35 +02:00
Ralf Ramsauer ae358d403c doorlockd: move sounds to DoorHandler
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-10-16 21:25:31 +02:00
Ralf Ramsauer 00f74d69f9 pydoorlock: Refactor LogicResponse to DoorlockResponse
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-10-16 21:25:23 +02:00
Ralf Ramsauer 8d37886ee1 doorlockd: propagate cfg through Logic
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-10-16 21:25:19 +02:00
Ralf Ramsauer 5b296b777d pydoorlock: WebApp: outsource WebApp
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-10-16 21:25:17 +02:00
Ralf Ramsauer 2cdf9d1b27 pydoorlock: Condense locality of Flask stuff
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-10-16 21:25:13 +02:00
Ralf Ramsauer badeb1945b pydoorlock: Authenticator: Move all auth-related logic to Authenticator
By passing the configuration

Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-10-16 21:25:10 +02:00
Ralf Ramsauer faecb6b98f pydoorlock: switch to new config parser
We want to use doorlockd for more than just serving webapps. Get rid of the
Flask config parser and use python's own config parser.

Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-10-16 21:25:06 +02:00
Ralf Ramsauer aaaad9b6ef pydoorlock: Extract WebApp pt. 1
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-10-16 21:25:02 +02:00
Ralf Ramsauer d1855bf77d pydoorlock: extract DoorState
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-10-16 21:24:54 +02:00
Ralf Ramsauer 55205ad247 doorlockd: First steps towards pydoorlock module
Extract Authenticator platform from doorlockd.

Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-10-16 21:24:51 +02:00
Ralf Ramsauer 7e26fa0cd6 doorlockd: remove superfluous code
No more users, drop it.

Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-10-08 00:24:36 +02:00
Ralf Ramsauer 147c4cff0c Bump version number: 2.0-rc1
Release 2.0-rc1

Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-10-07 03:48:15 +02:00
Ralf Ramsauer 69cbf48bae Make sounds working again
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-10-07 03:47:34 +02:00
Ralf Ramsauer b9dae15799 Bump version number: 2.0-rc1
Release 2.0-rc1

Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-10-06 04:14:55 +02:00
Ralf Ramsauer be33bb71ce ssl: use system certificates
Rely on system certificates instead of pinning them.

On Arch Linux, copy the certificate over to
  /etc/ca-certificates/trust-source/anchors
and run
  trust extract-compat

Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-10-06 04:14:34 +02:00
Ralf Ramsauer f5603272d2 doorlockd: frontend: support local authentication
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-09-18 01:28:34 +02:00
Ralf Ramsauer 45724f37c8 doorlockd: backend: support local authentication
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-09-18 01:28:34 +02:00
Ralf Ramsauer f6eabcd8cf Parameterise more settings
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-09-17 19:54:53 +02:00
Ralf Ramsauer f857fffac6 doorlockd: remove nasty flask-bootstrap dependency
Package is no longer officially maintainer, remove the dependency.

Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-09-08 02:55:14 +02:00
Ralf Ramsauer f226f44190 doorlockd: fix logic bug
We don't want to continue if we actually want to close.

Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-09-08 00:59:01 +02:00
Ralf Ramsauer f7725bba54 doorlockd: hooks: simplify hooks
and add present state

Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-09-08 00:41:21 +02:00
Ralf Ramsauer 4f95021fcf doorlockd: minor simplification
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-09-08 00:41:21 +02:00
Ralf Ramsauer e3491aaa45 doorlockd: Flask: disable use_reloader
This spawns the process twice which duplicates the UART thread, which,
of course, leads to silly races.

Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-09-07 22:04:24 +02:00
Ralf Ramsauer 9f3062340c doorlockd, avr: Don't respond on commands
No need to read back the AVR.

Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-09-07 22:02:41 +02:00
Ralf Ramsauer 95c35e7c06 Let scriptdir depend on PREFIX
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-09-05 22:31:37 +00:00
Ralf Ramsauer 60633bbc49 Flask: specify correct root_path
We need that for package installation.

Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-09-05 22:31:37 +00:00
Ralf Ramsauer e5fb445287 move sound specification from config to source
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-09-05 22:18:59 +00:00
Ralf Ramsauer c2c6e00651 Rename config.cfg -> doorlockd.cfg
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-09-05 20:22:16 +00:00
Ralf Ramsauer 3e8d8a98e3 Rename doorlockd.py -> doorlockd
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-09-05 18:44:07 +00:00
Ralf Ramsauer 71bc36a557 remove old code
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-03-23 22:22:50 +00:00
Ralf Ramsauer 020ac1b38b scripts: simplify mqtt
Only publish door status topic, rest will be done by the opennhab server.

Username, password and mqtt's hostname are stored in user's local .config.

Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2018-01-06 22:29:30 +01:00
Ralf Ramsauer 9ae9304551 scripts: replace mac
we have a new cash-desk PC

Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2017-01-07 00:29:58 +01:00
Ralf Ramsauer d04ba6ef63 doorlock-client: add mainwindow.showFullscreen() call
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-08-01 21:51:55 +02:00
Ralf Ramsauer d1d0d5b160 Fix QT quirk
So far, we used QT interfaces in a wrong way. QT is not thread safe, so
use its signal/slot concept and move network communication stuff to a
separate QThread.

Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-07-31 15:48:19 +02:00
Ralf Ramsauer 4ccf8e4f24 doorlock-client: refactor run to app_run
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-07-21 20:57:31 +02:00
Ralf Ramsauer 48d0fcaf6f doorlock-client: be even more verbose
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-07-21 20:50:32 +02:00
Ralf Ramsauer 42f168ff19 doorlick-client: remove misleading comment line
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-07-21 20:40:45 +02:00
Ralf Ramsauer ee481009e1 doorlock-client: Add more error output
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-07-21 20:40:32 +02:00
Ralf Ramsauer 951e1de987 Door: Redirect output to logfile
And use nohup for detached call.

Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-07-20 20:48:58 +02:00
Ralf Ramsauer c058e1e4d0 door, logic: propagate new logfile to Door class
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-07-20 20:48:54 +02:00