Fix merge conflicts

This commit is contained in:
Tuan Dang
2024-02-26 18:28:13 -08:00
10 changed files with 69 additions and 9 deletions
+1 -1
View File
@@ -10,7 +10,7 @@ description: "Log in to Infisical with LDAP"
then you should contact [email protected] to purchase an enterprise license to use it.
</Info>
You can configure your organization in Infisical to have members authenticate with the platform via [LDAP](https://en.wikipedia.org/wiki/Lightweight_Directory_Access_Protocol)
You can configure your organization in Infisical to have members authenticate with the platform via [LDAP](https://en.wikipedia.org/wiki/Lightweight_Directory_Access_Protocol).
<Steps>
<Step title="Prepare the LDAP configuration in Infisical">
+1
View File
@@ -149,6 +149,7 @@
"documentation/platform/sso/jumpcloud"
]
},
"documentation/platform/ldap",
{
"group": "LDAP",
"pages": [
+1 -1
View File
@@ -4,7 +4,7 @@ description: "Configure environment variables for self-hosted Infisical"
---
Infisical accepts all configurations via environment variables. For a basic self-hosted instance, at least `ENCRYPTION_KEY`, `AUTH_SECRET`, `DB_CONNECTION_URI` and `REDIS_URL` must be defined.
Infisical accepts all configurations via environment variables. For a minimal self-hosted instance, at least `ENCRYPTION_KEY`, `AUTH_SECRET`, `DB_CONNECTION_URI` and `REDIS_URL` must be defined.
However, you can configure additional settings to activate more features as needed.
## General platform