fixing ldap

core/settings.py

@@ -498,18 +498,20 @@ AUTH_LDAP_USER_ATTR_MAP = {
 
 AUTH_LDAP_USER_FLAGS_BY_GROUP = {
     "is_active": [
-                  "cn=PLATFORM-ADMIN,ou=groups,dc=ldap,dc=sharix,dc=ru",
-                  "cn=PLATFORM-SUPERVISOR,ou=groups,dc=ldap,dc=sharix,dc=ru",
-                  "cn=PLATFORM-SUPPORT,ou=groups,dc=ldap,dc=sharix,dc=ru",
-                  "cn=PLATFORM-TECHSUPPORT,ou=groups,dc=ldap,dc=sharix,dc=ru",
-                  "cn=METASERVICE-ADMIN,ou=groups,dc=ldap,dc=sharix,dc=ru",
-                  "cn=CLIENT,ou=groups,dc=ldap,dc=sharix,dc=ru",
-                  "cn=django_admin,ou=groups,dc=ldap,dc=sharix,dc=ru",
-                  ],
+        "cn=METASERVICE-ADMIN,ou=groups,dc=ldap,dc=sharix,dc=ru",
+        "cn=METASERVICE-SUPERVISOR,ou=groups,dc=ldap,dc=sharix,dc=ru",
+        "cn=METASERVICE-SUPPORT,ou=groups,dc=ldap,dc=sharix,dc=ru",
+        "cn=METASERVICE-TECHSUPPORT,ou=groups,dc=ldap,dc=sharix,dc=ru",
+        "cn=METASERVICE-CLIENT,ou=groups,dc=ldap,dc=sharix,dc=ru",
+        "cn=django_admin,ou=groups,dc=ldap,dc=sharix,dc=ru",
+    ],
     "is_staff": [
-                  "cn=PLATFORM-TECHSUPPORT,ou=groups,dc=ldap,dc=sharix,dc=ru",
-                  "cn=django_admin,ou=groups,dc=ldap,dc=sharix,dc=ru",
-                  ],
+        #"cn=METASERVICE-ADMIN,ou=groups,dc=ldap,dc=sharix,dc=ru",
+        #"cn=METASERVICE-SUPERVISOR,ou=groups,dc=ldap,dc=sharix,dc=ru",
+        #"cn=METASERVICE-SUPPORT,ou=groups,dc=ldap,dc=sharix,dc=ru",
+        "cn=METASERVICE-TECHSUPPORT,ou=groups,dc=ldap,dc=sharix,dc=ru",
+        "cn=django_admin,ou=groups,dc=ldap,dc=sharix,dc=ru",
+    ],
     "is_superuser": "cn=django_admin,ou=groups,dc=ldap,dc=sharix,dc=ru",
 }
 

core/settings_vars.py

@@ -37,7 +37,7 @@ DB_PORT = os.getenv("DB_PORT")
 
 EMAIL_HOST = os.getenv("EMAIL_HOST")
 EMAIL_PORT = os.getenv("EMAIL_PORT")
-EMAIL_USE_TLS = os.getenv("EMAIL_USE_TLS")
+EMAIL_USE_TLS = bool(os.getenv("EMAIL_USE_TLS")) if os.getenv("EMAIL_USE_TLS") is not None else None
 EMAIL_HOST_USER = os.getenv("EMAIL_HOST_USER")
 EMAIL_HOST_PASSWORD = os.getenv("EMAIL_HOST_PASSWORD")
 DEFAULT_FROM_EMAIL = os.getenv("DEFAULT_FROM_EMAIL")
@@ -63,6 +63,9 @@ EJ_URL = EJ_PROTOCOL + "://" + EJ_IP + ":" + EJ_PORT + "/" + "api/"
 EJ_SERVICE = os.getenv("EJ_SERVICE")
 EJ_HOST = os.getenv("EJ_HOST")
 
+EJ_USER = os.getenv("EJ_USER")
+EJ_PASSWORD = os.getenv("EJ_PASSWORD")
+
 ########
 #
 # ejabber