diff --git a/docs/docs/integrations/project-management/github.md b/docs/docs/integrations/project-management/github.md index a133de0aeedf..d18837208413 100644 --- a/docs/docs/integrations/project-management/github.md +++ b/docs/docs/integrations/project-management/github.md @@ -25,14 +25,14 @@ View your Flagsmith Flags inside your GitHub Issues and Pull Request 4. In the Flagsmith application, the button will now say "Manage Integration", click on it. 5. Finally, select the repository you wish to link. -### From github +### From GitHub 1. In GitHub, add the app from the [GitHub Marketplace](https://github.com/apps/flagsmith). 2. Select your organisation. 3. Select your repositories where you want install the app. 4. You will be redirected back to the Flagsmith app to finish the integration setup. 5. Select your Flagsmith Organisation. -6. Select the Flagmsith Project you want to associate with the repository where the app was installed to create the +6. Select the Flagsmith Project you want to associate with the repository where the app was installed to create the Integration. ## Adding a Flagsmith Flag to a GitHub issue or pull request diff --git a/docs/docs/system-administration/authentication/04-LDAP.md b/docs/docs/system-administration/authentication/04-LDAP.md index 91848c3ebb33..1e1cb93ed8d3 100644 --- a/docs/docs/system-administration/authentication/04-LDAP.md +++ b/docs/docs/system-administration/authentication/04-LDAP.md @@ -96,7 +96,7 @@ are using the correct environment variables. | **LDAP_DEFAULT_FLAGSMITH_ORGANISATION_ID** | 1 | All newly created users will be added to this originisation | None | | **LDAP_AUTH_SYNC_USER_RELATIONS** | custom_auth.ldap.sync_user_groups | Path to a callable used to sync user relations. Note: if you are setting this value to `custom_auth.ldap.sync_user_groups` please make sure `LDAP_DEFAULT_FLAGSMITH_ORGANISATION_ID` is set. | django_python3_ldap.utils.sync_user_relations | | **LDAP_AUTH_FORMAT_SEARCH_FILTERS** | custom_auth.ldap.login_group_search_filter | Path to a callable used to add search filters to login to restrict login to a certain group | django_python3_ldap.utils.format_search_filters | -| **LDAP_SYNCED_GROUPS** | CN=Readers,CN=Roles,CN=webapp01,
dc=admin,dc=com:CN=Marvel,CN=Roles,
CN=webapp01,dc=admin,dc=com | colon(:) seperated list of DN's of ldap group that will be copied over to flagmsith (lazily, i.e: On user login we will create the group(s) and add the current user to the group(s) if the user is a part of them). Note: please make sure to set `LDAP_AUTH_SYNC_USER_RELATIONS` to `custom_auth.ldap.sync_user_groups` in order for this to work. | [] | +| **LDAP_SYNCED_GROUPS** | CN=Readers,CN=Roles,CN=webapp01,
dc=admin,dc=com:CN=Marvel,CN=Roles,
CN=webapp01,dc=admin,dc=com | colon(:) seperated list of DN's of ldap group that will be copied over to Flagsmith (lazily, i.e: On user login we will create the group(s) and add the current user to the group(s) if the user is a part of them). Note: please make sure to set `LDAP_AUTH_SYNC_USER_RELATIONS` to `custom_auth.ldap.sync_user_groups` in order for this to work. | [] | | **LDAP_LOGIN_GROUP** | CN=Readers,CN=Roles,CN=webapp01,
dc=admin,dc=com | DN of the user allowed login user group. Note: Please make sure to set `LDAP_AUTH_FORMAT_SEARCH_FILTERS` to `custom_auth.ldap.login_group_search_filter` in order for this to work. | None | | **LDAP_SYNC_USER_USERNAME** | john | Username used by [sync_ldap_users_and_groups](#sync-ldap-groups) in order to connect to the server. | None | | **LDAP_SYNC_USER_PASSWORD** | password | Password used by [sync_ldap_users_and_groups](#sync-ldap-groups) in order to connect to the server. | None | @@ -118,7 +118,7 @@ are using the correct environment variables. | **LDAP_DEFAULT_FLAGSMITH_ORGANISATION_ID** | 1 | All newly created users will be added to this originisation | None | | **LDAP_AUTH_SYNC_USER_RELATIONS** | flagsmith_ldap.ldap.sync_user_groups | Path to a callable used to sync user relations. Note: if you are setting this value to `flagsmith_ldap.ldap.sync_user_groups` please make sure `LDAP_DEFAULT_FLAGSMITH_ORGANISATION_ID` is set. | django_python3_ldap.utils.sync_user_relations | | **LDAP_AUTH_FORMAT_SEARCH_FILTERS** | flagsmith_ldap.ldap.login_group_search_filter | Path to a callable used to add search filters to login to restrict login to a certain group | django_python3_ldap.utils.format_search_filters | -| **LDAP_SYNCED_GROUPS** | CN=Readers,CN=Roles,CN=webapp01,
dc=admin,dc=com:CN=Marvel,CN=Roles,
CN=webapp01,dc=admin,dc=com | colon(:) seperated list of DN's of ldap group that will be copied over to flagmsith (lazily, i.e: On user login we will create the group(s) and add the current user to the group(s) if the user is a part of them). Note: please make sure to set `LDAP_AUTH_SYNC_USER_RELATIONS` to `flagsmith.ldap.sync_user_groups` in order for this to work. | [] | +| **LDAP_SYNCED_GROUPS** | CN=Readers,CN=Roles,CN=webapp01,
dc=admin,dc=com:CN=Marvel,CN=Roles,
CN=webapp01,dc=admin,dc=com | colon(:) seperated list of DN's of ldap group that will be copied over to Flagsmith (lazily, i.e: On user login we will create the group(s) and add the current user to the group(s) if the user is a part of them). Note: please make sure to set `LDAP_AUTH_SYNC_USER_RELATIONS` to `flagsmith.ldap.sync_user_groups` in order for this to work. | [] | | **LDAP_LOGIN_GROUP** | CN=Readers,CN=Roles,CN=webapp01,
dc=admin,dc=com | DN of the user allowed login user group. Note: Please make sure to set `LDAP_AUTH_FORMAT_SEARCH_FILTERS` to `flagsmith_ldap.ldap.login_group_search_filter` in order for this to work. | None | | **LDAP_SYNC_USER_USERNAME** | john | Username used by [sync_ldap_users_and_groups](#sync-ldap-groups) in order to connect to the server. | None | | **LDAP_SYNC_USER_PASSWORD** | password | Password used by [sync_ldap_users_and_groups](#sync-ldap-groups) in order to connect to the server. | None |