Browse Source

fixes to make it work on centos: "none" when no protocols and ldap template fix

Xabier de Zuazo 11 years ago
parent
commit
6b469f1e97
3 changed files with 3 additions and 4 deletions
  1. 0 1
      attributes/conf-10-mail.rb
  2. 2 1
      libraries/conf.rb
  3. 1 2
      templates/default/dovecot-ldap.conf.ext.erb

+ 0 - 1
attributes/conf-10-mail.rb

@@ -23,7 +23,6 @@ default['dovecot']['conf']['valid_chroot_dirs'] = nil
 default['dovecot']['conf']['mail_chroot'] = nil
 default['dovecot']['conf']['auth_socket_path'] = nil
 default['dovecot']['conf']['mail_plugin_dir'] = nil
-default['dovecot']['conf']['mail_plugins'] = nil
 default['dovecot']['conf']['mail_cache_min_mail_count'] = nil
 default['dovecot']['conf']['mailbox_idle_check_interval'] = nil
 default['dovecot']['conf']['mail_save_crlf'] = nil

+ 2 - 1
libraries/conf.rb

@@ -30,7 +30,8 @@ module Dovecot
     def self.protocols(conf)
       # dovecot: config: Fatal: Error in configuration file /etc/dovecot/dovecot.conf: protocols: Unknown protocol: lda
       ignore_protos = [ 'lda' ]
-      (Dovecot::Protocols.list(conf) - ignore_protos).join(' ')
+      protos = Dovecot::Protocols.list(conf) - ignore_protos
+      protos.empty? ? 'none' : protos.join(' ')
     end
 
     def self.authdb(driver, type, conf)

+ 1 - 2
templates/default/dovecot-ldap.conf.ext.erb

@@ -128,8 +128,7 @@
 # userdb prefetch instead of userdb ldap in dovecot.conf. In that case you'll
 # also have to include user_attrs in pass_attrs field prefixed with "userdb_"
 # string. For example:
-<%= Dovecot::Conf.attribute(@conf['ldap'], 'pass_attrs', 'uid=user,userPassword=password,\') %>
-#  homeDirectory=userdb_home,uidNumber=userdb_uid,gidNumber=userdb_gid
+<%= Dovecot::Conf.attribute(@conf['ldap'], 'pass_attrs', 'uid=user,userPassword=password,homeDirectory=userdb_home,uidNumber=userdb_uid,gidNumber=userdb_gid') %>
 
 # Filter for password lookups
 <%= Dovecot::Conf.attribute(@conf['ldap'], 'pass_filter', '(&(objectClass=posixAccount)(uid=%u))') %>