From 0acec5a6d4badff05652b5f29edf0b6b2e550a99 Mon Sep 17 00:00:00 2001 From: Avsynthe Date: Fri, 2 Dec 2022 22:21:15 +1100 Subject: [PATCH] Revert "Merge branch 'goauthentik:main' into main" This reverts commit b03a84a2f5833a8512881fbf515cb958507f9711, reversing changes made to c02669da52da793104ee2210c8cdcf1fe278d0a7. --- lifecycle/gunicorn.conf.py | 8 ++++++++ website/integrations/services/bookstack/index.md | 13 ++----------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/lifecycle/gunicorn.conf.py b/lifecycle/gunicorn.conf.py index 48c5f76cd..e579375b9 100644 --- a/lifecycle/gunicorn.conf.py +++ b/lifecycle/gunicorn.conf.py @@ -1,5 +1,6 @@ """Gunicorn config""" import os +import pwd from hashlib import sha512 from multiprocessing import cpu_count from os import makedirs @@ -22,6 +23,13 @@ if TYPE_CHECKING: bind = "127.0.0.1:8000" +try: + pwd.getpwnam("authentik") + user = "authentik" + group = "authentik" +except KeyError: + pass + _tmp = Path(gettempdir()) worker_class = "lifecycle.worker.DjangoUvicornWorker" worker_tmp_dir = str(_tmp.joinpath("authentik_worker_tmp")) diff --git a/website/integrations/services/bookstack/index.md b/website/integrations/services/bookstack/index.md index 42b73f0c6..3717153fc 100644 --- a/website/integrations/services/bookstack/index.md +++ b/website/integrations/services/bookstack/index.md @@ -71,10 +71,6 @@ Modify the following Example SAML config and paste incorporate into your `.env` ```bash # Set authentication method to be saml2 AUTH_METHOD=saml2 -# Control if BookStack automatically initiates login via your SAML system if it's the only authentication method. -# Prevents the need for the user to click the "Login with x" button on the login page. -# Setting this to true enables auto-initiation. -AUTH_AUTO_INITIATE=true # Set the display name to be shown on the login button. # (Login with ) SAML2_NAME=authentik @@ -82,20 +78,15 @@ SAML2_NAME=authentik SAML2_EMAIL_ATTRIBUTE=email # Name of the attribute to use as an ID for the SAML user. SAML2_EXTERNAL_ID_ATTRIBUTE=uid -# Enable SAML group sync. -SAML2_USER_TO_GROUPS=true -# Set the attribute from which BookStack will read groups names from. -# You will need to rename your roles in Bookstack to match your groups in authentik. -SAML2_GROUP_ATTRIBUTE=http://schemas.xmlsoap.org/claims/Group # Name of the attribute(s) to use for the user's display name # Can have multiple attributes listed, separated with a '|' in which # case those values will be joined with a space. # Example: SAML2_DISPLAY_NAME_ATTRIBUTES=firstName|lastName # Defaults to the ID value if not found. -SAML2_DISPLAY_NAME_ATTRIBUTES=http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname +SAML2_DISPLAY_NAME_ATTRIBUTES=Name # Identity Provider entityID URL SAML2_IDP_ENTITYID=METADATAURL -# Auto-load metatadata from the IDP + # Auto-load metatadata from the IDP # Setting this to true negates the need to specify the next three options SAML2_AUTOLOAD_METADATA=true