add setting override to disable sso
This commit is contained in:
parent
d1df40633a
commit
91c33b0431
|
@ -24,8 +24,6 @@ register_converter(AgentIDConverter, "agent")
|
|||
|
||||
urlpatterns = [
|
||||
path("", home),
|
||||
# all auth urls
|
||||
path("_allauth/", include(allauth_urls)),
|
||||
path("v2/checkcreds/", CheckCredsV2.as_view()),
|
||||
path("v2/login/", LoginViewV2.as_view()),
|
||||
path("logout/", knox_views.LogoutView.as_view()),
|
||||
|
@ -44,10 +42,15 @@ urlpatterns = [
|
|||
path("scripts/", include("scripts.urls")),
|
||||
path("alerts/", include("alerts.urls")),
|
||||
path("accounts/", include("accounts.urls")),
|
||||
path("accounts/", include("ee.sso.urls")),
|
||||
path("reporting/", include("ee.reporting.urls")),
|
||||
]
|
||||
|
||||
if not getattr(settings, "TRMM_DISABLE_SSO", False):
|
||||
urlpatterns += (
|
||||
path("_allauth/", include(allauth_urls)),
|
||||
path("accounts/", include("ee.sso.urls")),
|
||||
)
|
||||
|
||||
if getattr(settings, "BETA_API_ENABLED", False):
|
||||
urlpatterns += (path("beta/v1/", include("beta.v1.urls")),)
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@ VERSION=latest
|
|||
TRMM_USER=tactical
|
||||
TRMM_PASS=tactical
|
||||
|
||||
# optional web port override settings
|
||||
# optional web port override settings
|
||||
TRMM_HTTP_PORT=80
|
||||
TRMM_HTTPS_PORT=443
|
||||
|
||||
|
@ -30,3 +30,6 @@ TRMM_DISABLE_WEB_TERMINAL=False
|
|||
|
||||
# disable server side scripts
|
||||
TRMM_DISABLE_SERVER_SCRIPTS=False
|
||||
|
||||
# disable sso
|
||||
TRMM_DISABLE_SSO=False
|
||||
|
|
|
@ -20,6 +20,7 @@ set -e
|
|||
: "${SKIP_UWSGI_CONFIG:=0}"
|
||||
: "${TRMM_DISABLE_WEB_TERMINAL:=False}"
|
||||
: "${TRMM_DISABLE_SERVER_SCRIPTS:=False}"
|
||||
: "${TRMM_DISABLE_SSO:=False}"
|
||||
|
||||
: "${CERT_PRIV_PATH:=${TACTICAL_DIR}/certs/privkey.pem}"
|
||||
: "${CERT_PUB_PATH:=${TACTICAL_DIR}/certs/fullchain.pem}"
|
||||
|
@ -120,6 +121,7 @@ MESH_WS_URL = '${MESH_WS_URL}'
|
|||
ADMIN_ENABLED = False
|
||||
TRMM_DISABLE_WEB_TERMINAL = ${TRMM_DISABLE_WEB_TERMINAL}
|
||||
TRMM_DISABLE_SERVER_SCRIPTS = ${TRMM_DISABLE_SERVER_SCRIPTS}
|
||||
TRMM_DISABLE_SSO = ${TRMM_DISABLE_SSO}
|
||||
EOF
|
||||
)"
|
||||
|
||||
|
|
|
@ -64,6 +64,7 @@ services:
|
|||
TRMM_PASS: ${TRMM_PASS}
|
||||
TRMM_DISABLE_WEB_TERMINAL: ${TRMM_DISABLE_WEB_TERMINAL}
|
||||
TRMM_DISABLE_SERVER_SCRIPTS: ${TRMM_DISABLE_SERVER_SCRIPTS}
|
||||
TRMM_DISABLE_SSO: ${TRMM_DISABLE_SSO}
|
||||
depends_on:
|
||||
- tactical-postgres
|
||||
- tactical-meshcentral
|
||||
|
|
Loading…
Reference in New Issue