trustchain-oc1-orchestral
/
authentik
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

api: fix backup capability not being detected correctly 

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
This commit is contained in:
Jens Langhammer 2021-08-09 00:32:11 +02:00
parent 5b57d67b5f
commit 7a836e0d7e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
authentik/api/v2/config.py
View File

@ -49,7 +49,7 @@ class ConfigView(APIView):
caps.append(Capabilities.CAN_GEO_IP) caps.append(Capabilities.CAN_GEO_IP)
if SERVICE_HOST_ENV_NAME in environ: if SERVICE_HOST_ENV_NAME in environ:
# Running in k8s, only s3 backup is supported # Running in k8s, only s3 backup is supported
if CONFIG.y_bool("postgresql.s3_backup"): if CONFIG.y("postgresql.s3_backup"):
caps.append(Capabilities.CAN_BACKUP) caps.append(Capabilities.CAN_BACKUP)
else: else:
# Running in compose, backup is always supported # Running in compose, backup is always supported

3
authentik/root/settings.py
View File

@ -20,6 +20,7 @@ from time import time
import structlog import structlog
from celery.schedules import crontab from celery.schedules import crontab
from kubernetes.config.incluster_config import SERVICE_HOST_ENV_NAME
from sentry_sdk import init as sentry_init from sentry_sdk import init as sentry_init
from sentry_sdk.api import set_tag from sentry_sdk.api import set_tag
from sentry_sdk.integrations.celery import CeleryIntegration from sentry_sdk.integrations.celery import CeleryIntegration
@ -396,7 +397,7 @@ if _ERROR_REPORTING:
if build_hash == "": if build_hash == "":
build_hash = "tagged" build_hash = "tagged"
set_tag("authentik.build_hash", build_hash) set_tag("authentik.build_hash", build_hash)
set_tag("authentik.env", "kubernetes" if "KUBERNETES_PORT" in os.environ else "compose") set_tag("authentik.env", "kubernetes" if SERVICE_HOST_ENV_NAME in os.environ else "compose")
set_tag("authentik.component", "backend") set_tag("authentik.component", "backend")
j_print( j_print(
"Error reporting is enabled", "Error reporting is enabled",