From a9ee67bf2d1b5967efa796f684d29674ece35cb0 Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens.langhammer@beryju.org>
Date: Sun, 18 Oct 2020 22:39:13 +0200
Subject: [PATCH] sources/ldap: adjust order or fields in form

---
 mkdocs.yml                     | 20 ++++++++++----------
 passbook/root/settings.py      |  2 ++
 passbook/sources/ldap/forms.py | 10 +++++-----
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index b4e32ab45..99fae727a 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -48,16 +48,16 @@ nav:
     - Expression: policies/expression.md
   - Integrations:
     - as Provider:
-        - Amazon Web Services: integrations/services/aws/index.md
-        - GitLab: integrations/services/gitlab/index.md
-        - Rancher: integrations/services/rancher/index.md
-        - Harbor: integrations/services/harbor/index.md
-        - Sentry: integrations/services/sentry/index.md
-        - Ansible Tower/AWX: integrations/services/tower-awx/index.md
-        - VMware vCenter: integrations/services/vmware-vcenter/index.md
-        - Ubuntu Landscape: integrations/services/ubuntu-landscape/index.md
-        - Sonarr: integrations/services/sonarr/index.md
-        - Tautulli: integrations/services/tautulli/index.md
+      - Amazon Web Services: integrations/services/aws/index.md
+      - GitLab: integrations/services/gitlab/index.md
+      - Rancher: integrations/services/rancher/index.md
+      - Harbor: integrations/services/harbor/index.md
+      - Sentry: integrations/services/sentry/index.md
+      - Ansible Tower/AWX: integrations/services/tower-awx/index.md
+      - VMware vCenter: integrations/services/vmware-vcenter/index.md
+      - Ubuntu Landscape: integrations/services/ubuntu-landscape/index.md
+      - Sonarr: integrations/services/sonarr/index.md
+      - Tautulli: integrations/services/tautulli/index.md
   - Maintenance:
     - Backups: maintenance/backups/index.md
   - Upgrading:
diff --git a/passbook/root/settings.py b/passbook/root/settings.py
index c2a8af55a..98b1b2b34 100644
--- a/passbook/root/settings.py
+++ b/passbook/root/settings.py
@@ -18,6 +18,7 @@ from json import dumps
 import structlog
 from celery.schedules import crontab
 from sentry_sdk import init as sentry_init
+from sentry_sdk.integrations.redis import RedisIntegration
 from sentry_sdk.integrations.celery import CeleryIntegration
 from sentry_sdk.integrations.django import DjangoIntegration
 
@@ -312,6 +313,7 @@ if not DEBUG and _ERROR_REPORTING:
         integrations=[
             DjangoIntegration(transaction_style="function_name"),
             CeleryIntegration(),
+            RedisIntegration(),
         ],
         before_send=before_send,
         release="passbook@%s" % __version__,
diff --git a/passbook/sources/ldap/forms.py b/passbook/sources/ldap/forms.py
index 9804644d8..362ed9a9c 100644
--- a/passbook/sources/ldap/forms.py
+++ b/passbook/sources/ldap/forms.py
@@ -26,21 +26,21 @@ class LDAPSourceForm(forms.ModelForm):
             "enabled",
             # -- start of our custom fields
             "server_uri",
+            "start_tls",
             "bind_cn",
             "bind_password",
-            "start_tls",
             "base_dn",
+            "sync_users",
+            "sync_users_password",
+            "sync_groups",
+            "property_mappings",
             "additional_user_dn",
             "additional_group_dn",
             "user_object_filter",
             "group_object_filter",
             "user_group_membership_field",
             "object_uniqueness_field",
-            "sync_users",
-            "sync_users_password",
-            "sync_groups",
             "sync_parent_group",
-            "property_mappings",
         ]
         widgets = {
             "name": forms.TextInput(),