1. Zhang Huangbin
  2. iredmail

Commits

Zhang Huangbin  committed 26524ee

Revert last commit.

  • Participants
  • Parent commits 614732a
  • Branches default

Comments (0)

Files changed (7)

File iRedMail/functions/ldap_server.sh

View file
  • Ignore whitespace
 ${LDAP_ENABLED_SERVICE}: ${LDAP_SERVICE_SHADOW_ADDRESS}
 ${LDAP_ENABLED_SERVICE}: ${LDAP_SERVICE_LIB_STORAGE}
 ${LDAP_ENABLED_SERVICE}: ${LDAP_SERVICE_DOMAIN_ADMIN}
-${LDAP_ENABLED_SERVICE}: ${LDAP_SERVICE_WEBMAIL}-127.0.0.1-imapsecured
 ${LDAP_ATTR_DOMAIN_GLOBALADMIN}: yes
 EOF
 }

File iRedMail/samples/dovecot/dovecot-ldap.conf

View file
  • Ignore whitespace
 #iterate_attrs   = mail=user
 #iterate_filter  = (&(objectClass=mailUser)(accountStatus=active)(enabledService=mail))
 
-user_filter     = (&(objectClass=mailUser)(accountStatus=active)(enabledService=mail)(|(enabledService=%Ls%Lc)(enabledService=webmail-%r-%Ls%Lc))(|(mail=%u)(&(enabledService=shadowaddress)(shadowAddress=%u))))
+user_filter     = (&(objectClass=mailUser)(accountStatus=active)(enabledService=mail)(enabledService=%Ls%Lc)(|(mail=%u)(&(enabledService=shadowaddress)(shadowAddress=%u))))
 user_attrs      = mail=user,homeDirectory=home,=mail=maildir:~/Maildir/,mailQuota=quota_rule=*:bytes=%$
-pass_filter     = (&(objectClass=mailUser)(accountStatus=active)(enabledService=mail)(|(enabledService=%Ls%Lc)(enabledService=webmail-%r-%Ls%Lc))(|(mail=%u)(&(enabledService=shadowaddress)(shadowAddress=%u))))
+pass_filter     = (&(objectClass=mailUser)(accountStatus=active)(enabledService=mail)(enabledService=%Ls%Lc)(|(mail=%u)(&(enabledService=shadowaddress)(shadowAddress=%u))))
 pass_attrs      = mail=user,userPassword=password
 default_pass_scheme = CRYPT

File iRedMail/samples/dovecot/dovecot-sql.conf

View file
  • Ignore whitespace
-# (mailbox.enable%Ls%Lc=1 AND '%r'<>'127.0.0.1') means accessing mailbox via
-#   IMAP or IMAP over TLS on non-localhost (127.0.0.1)
-#
-# (mailbox.enablewebmail=1 AND '%Ls%Lc'='imapsecured' AND '%r' IN ('127.0.0.1'))
-#   means accessing webmail hosted on '127.0.0.1' via IMAP over TLS. If you
-#   want to allow remote access from webmail hosted on other servers, please
-#   extend the list and reload/restart Dovecot service.
-#   WARNING: It's not recommended to access mailbox from webmail with insecure
-#   IMAP protocol.
-
 driver = PH_SQL_DRIVER
 default_pass_scheme = CRYPT
 connect = host=PH_SQL_SERVER dbname=PH_VMAIL_DB user=PH_VMAIL_DB_BIND_USER password=PH_VMAIL_DB_BIND_PASSWD
 FROM mailbox,domain \
 WHERE mailbox.username='%u' \
     AND mailbox.domain='%d' \
-    AND ((mailbox.enable%Ls%Lc=1 AND '%r'<>'127.0.0.1') OR (mailbox.enablewebmail=1 AND '%Ls%Lc'='imapsecured' AND '%r' IN ('127.0.0.1'))) \
+    AND mailbox.enable%Ls%Lc=1 \
     AND mailbox.domain=domain.domain \
     AND domain.backupmx=0 \
     AND domain.active=1 \

File iRedMail/samples/iredmail.mysql

View file
  • Ignore whitespace
     enablepop3secured TINYINT(1) NOT NULL DEFAULT 1,
     enableimap TINYINT(1) NOT NULL DEFAULT 1,
     enableimapsecured TINYINT(1) NOT NULL DEFAULT 1,
-    enablewebmail TINYINT(1) NOT NULL DEFAULT 1,
     enabledeliver TINYINT(1) NOT NULL DEFAULT 1,
     enablelda TINYINT(1) NOT NULL DEFAULT 1,
     enablemanagesieve TINYINT(1) NOT NULL DEFAULT 1,
     INDEX (enablepop3secured),
     INDEX (enableimap),
     INDEX (enableimapsecured),
-    INDEX (enablewebmail),
     INDEX (enabledeliver),
     INDEX (enablelda),
     INDEX (enablemanagesieve),

File iRedMail/samples/iredmail.pgsql

View file
  • Ignore whitespace
     enablepop3secured INT2 NOT NULL DEFAULT 1,
     enableimap INT2 NOT NULL DEFAULT 1,
     enableimapsecured INT2 NOT NULL DEFAULT 1,
-    enablewebmail INT2 NOT NULL DEFAULT 1,
     enabledeliver INT2 NOT NULL DEFAULT 1,
     enablelda INT2 NOT NULL DEFAULT 1,
     enablemanagesieve INT2 NOT NULL DEFAULT 1,
 CREATE INDEX idx_mailbox_enablepop3secured ON mailbox (enablepop3secured);
 CREATE INDEX idx_mailbox_enableimap ON mailbox (enableimap);
 CREATE INDEX idx_mailbox_enableimapsecured ON mailbox (enableimapsecured);
-CREATE INDEX idx_mailbox_webmail ON mailbox (enablewebmail);
 CREATE INDEX idx_mailbox_enabledeliver ON mailbox (enabledeliver);
 CREATE INDEX idx_mailbox_enablelda ON mailbox (enablelda);
 CREATE INDEX idx_mailbox_enablemanagesieve ON mailbox (enablemanagesieve);

File iRedMail/tools/create_mail_user_OpenLDAP.py

View file
  • Ignore whitespace
         ('mtaTransport',        ['dovecot']),
         ('enabledService',      ['internal', 'doveadm', 'lib-storage',
                                  'mail', 'smtp', 'smtpsecured',
-                                 'pop3', 'pop3secured',
-                                 'imap', 'imapsecured',
-                                 'webmail-127.0.0.1-imapsecured',   # Webmail on localhost
-                                 'deliver', 'lda', 'forward', 'senderbcc', 'recipientbcc',
+                                 'pop3', 'pop3secured', 'imap', 'imapsecured',
+                                'deliver', 'lda', 'forward', 'senderbcc', 'recipientbcc',
                                  'managesieve', 'managesievesecured',
                                  'sieve', 'sievesecured', 'lmtp',
                                  'shadowaddress',

File iRedMail/tools/create_mail_user_OpenLDAP.sh

View file
  • Ignore whitespace
 enabledService: pop3secured
 enabledService: imap
 enabledService: imapsecured
-enabledService: webmail-127.0.0.1-imapsecured
 enabledService: managesieve
 enabledService: managesievesecured
 enabledService: sieve