1. Zhang Huangbin
  2. iredmail

Commits

Zhang Huangbin  committed e98f308

* Don't use 'enabledService=domainadmin' in Awstats ldap filter, just 'domainGlobalAdmin=yes' is enough.
* One more variable on command line: CHECK_NEW_IREDMAIL.

  • Participants
  • Parent commits 430ed72
  • Branches default

Comments (0)

Files changed (2)

File iRedMail/functions/awstats.sh

View file
     AuthBasicProvider ldap
     AuthzLDAPAuthoritative   Off
 
-    AuthLDAPUrl   ldap://${LDAP_SERVER_HOST}:${LDAP_SERVER_PORT}/${LDAP_BASEDN}?${LDAP_ATTR_USER_RDN}?sub?(&(objectclass=${LDAP_OBJECTCLASS_MAILUSER})(${LDAP_ATTR_ACCOUNT_STATUS}=${LDAP_STATUS_ACTIVE})(${LDAP_ENABLED_SERVICE}=${LDAP_SERVICE_DOMAIN_ADMIN})(${LDAP_ATTR_DOMAIN_GLOBALADMIN}=${LDAP_VALUE_DOMAIN_GLOBALADMIN}))
+    AuthLDAPUrl   ldap://${LDAP_SERVER_HOST}:${LDAP_SERVER_PORT}/${LDAP_BASEDN}?${LDAP_ATTR_USER_RDN}?sub?(&(objectclass=${LDAP_OBJECTCLASS_MAILUSER})(${LDAP_ATTR_ACCOUNT_STATUS}=${LDAP_STATUS_ACTIVE})(${LDAP_ATTR_DOMAIN_GLOBALADMIN}=${LDAP_VALUE_DOMAIN_GLOBALADMIN}))
 
     AuthLDAPBindDN "${LDAP_BINDDN}"
     AuthLDAPBindPassword "${LDAP_BINDPW}"

File iRedMail/pkgs/get_all.sh

View file
 fi
 
 # Check latest version
-check_status_before_run check_new_iredmail
+[ X"${CHECK_NEW_IREDMAIL}" != X'NO' ] && \
+    check_status_before_run check_new_iredmail
 
 prepare_dirs