Merge branch 'master' into stage-challenge

# Conflicts:
#	web/src/elements/buttons/SpinnerButton.ts
This commit is contained in:
Jens Langhammer
2021-02-27 17:54:59 +01:00
23 changed files with 99 additions and 48 deletions

View File

@ -10,7 +10,7 @@ from authentik.lib.config import CONFIG
def get_geoip_reader() -> Optional[Reader]:
"""Get GeoIP Reader, if configured, otherwise none"""
path = CONFIG.y("authentik.geoip")
if path == "":
if path == "" or not path:
return None
return Reader(path)