last templates modified to use variables and some attributes moved/renamed/fixed

attributes/conf-dovecot-ldap.rb

@@ -0,0 +1,33 @@
+
+default['dovecot']['conf']['ldap']['hosts'] = nil
+default['dovecot']['conf']['ldap']['uris'] = nil
+default['dovecot']['conf']['ldap']['dn'] = nil
+default['dovecot']['conf']['ldap']['dnpass'] = nil
+default['dovecot']['conf']['ldap']['sasl_bind'] = nil
+default['dovecot']['conf']['ldap']['sasl_mech'] = nil
+default['dovecot']['conf']['ldap']['sasl_realm'] = nil
+default['dovecot']['conf']['ldap']['sasl_authz_id'] = nil
+default['dovecot']['conf']['ldap']['tls'] = nil
+default['dovecot']['conf']['ldap']['tls_ca_cert_file'] = nil
+default['dovecot']['conf']['ldap']['tls_ca_cert_file'] = nil
+default['dovecot']['conf']['ldap']['tls_ca_cert_dir'] = nil
+default['dovecot']['conf']['ldap']['tls_cipher_suite'] = nil
+default['dovecot']['conf']['ldap']['tls_cert_file'] = nil
+default['dovecot']['conf']['ldap']['tls_key_file'] = nil
+default['dovecot']['conf']['ldap']['tls_require_cert'] = nil
+default['dovecot']['conf']['ldap']['ldaprc_path'] = nil
+default['dovecot']['conf']['ldap']['debug_level'] = nil
+default['dovecot']['conf']['ldap']['auth_bind'] = nil
+default['dovecot']['conf']['ldap']['auth_bind_userdn'] = nil
+default['dovecot']['conf']['ldap']['ldap_version'] = nil
+default['dovecot']['conf']['ldap']['deref'] = nil
+default['dovecot']['conf']['ldap']['scope'] = nil
+default['dovecot']['conf']['ldap']['user_attrs'] = nil
+default['dovecot']['conf']['ldap']['user_filter'] = nil
+default['dovecot']['conf']['ldap']['pass_attrs'] = nil
+default['dovecot']['conf']['ldap']['pass_attrs'] = nil
+default['dovecot']['conf']['ldap']['pass_filter'] = nil
+default['dovecot']['conf']['ldap']['iterate_attrs'] = nil
+default['dovecot']['conf']['ldap']['iterate_filter'] = nil
+default['dovecot']['conf']['ldap']['default_pass_scheme'] = nil
+

attributes/conf-dovecot-sql.rb

@@ -0,0 +1,8 @@
+
+default['dovecot']['conf']['sql']['driver'] = nil
+default['dovecot']['conf']['sql']['connect'] = nil
+default['dovecot']['conf']['sql']['default_pass_scheme'] = nil
+default['dovecot']['conf']['sql']['password_query'] = nil
+default['dovecot']['conf']['sql']['user_query'] = nil
+default['dovecot']['conf']['sql']['iterate_query'] = nil
+

attributes/plugins.rb

@@ -1,5 +1,5 @@
 
-default['dovecot']['mail_plugins'] = [ 'sieve' ]
+default['dovecot']['conf']['mail_plugins'] = [ 'sieve' ]
 
 default['dovecot']['plugins']['mail_log'] = nil
 # default['dovecot']['plugins']['mail_log'] = {

libraries/plugins.rb

@@ -2,7 +2,7 @@ module Dovecot
   module Plugins
 
     def self.required?(plugin, attrs)
-      return true if attrs.has_key?('mail_plugins') and attrs['mail_plugins'].include?(plugin)
+      return true if attrs['conf'].has_key?('mail_plugins') and attrs['conf']['mail_plugins'].include?(plugin)
       attrs['protocols'].sort.each do |protocol, conf|
         return true if conf.has_key?('mail_plugins') and conf['mail_plugins'].include?(plugin)
       end

templates/default/dovecot-ldap.conf.ext.erb

@@ -14,57 +14,58 @@
 #        by * none
 
 # Space separated list of LDAP hosts to use. host:port is allowed too.
-#hosts =
+<%= Dovecot::Conf.attribute(@conf['ldap'], 'hosts') %>
 
 # LDAP URIs to use. You can use this instead of hosts list. Note that this
 # setting isn't supported by all LDAP libraries.
-#uris = 
+<%= Dovecot::Conf.attribute(@conf['ldap'], 'uris') %>
 
 # Distinguished Name - the username used to login to the LDAP server.
 # Leave it commented out to bind anonymously (useful with auth_bind=yes).
-#dn = 
+<%= Dovecot::Conf.attribute(@conf['ldap'], 'dn') %>
 
 # Password for LDAP server, if dn is specified.
-#dnpass = 
+<%= Dovecot::Conf.attribute(@conf['ldap'], 'dnpass') %>
 
 # Use SASL binding instead of the simple binding. Note that this changes
 # ldap_version automatically to be 3 if it's lower. Also note that SASL binds
 # and auth_bind=yes don't work together.
-#sasl_bind = no
+<%= Dovecot::Conf.attribute(@conf['ldap'], 'sasl_bind', false) %>
 # SASL mechanism name to use.
-#sasl_mech =
+<%= Dovecot::Conf.attribute(@conf['ldap'], 'sasl_mech') %>
 # SASL realm to use.
-#sasl_realm =
+<%= Dovecot::Conf.attribute(@conf['ldap'], 'sasl_realm') %>
 # SASL authorization ID, ie. the dnpass is for this "master user", but the
 # dn is still the logged in user. Normally you want to keep this empty.
-#sasl_authz_id =
+<%= Dovecot::Conf.attribute(@conf['ldap'], 'sasl_authz_id') %>
 
 # Use TLS to connect to the LDAP server.
-#tls = no
+<%= Dovecot::Conf.attribute(@conf['ldap'], 'tls', false) %>
 # TLS options, currently supported only with OpenLDAP:
-#tls_ca_cert_file =
-#tls_ca_cert_dir =
-#tls_cipher_suite =
+<%= Dovecot::Conf.attribute(@conf['ldap'], 'tls_ca_cert_file') %>
+<%= Dovecot::Conf.attribute(@conf['ldap'], 'tls_ca_cert_file') %>
+<%= Dovecot::Conf.attribute(@conf['ldap'], 'tls_ca_cert_dir') %>
+<%= Dovecot::Conf.attribute(@conf['ldap'], 'tls_cipher_suite') %>
 # TLS cert/key is used only if LDAP server requires a client certificate.
-#tls_cert_file =
-#tls_key_file =
+<%= Dovecot::Conf.attribute(@conf['ldap'], 'tls_cert_file') %>
+<%= Dovecot::Conf.attribute(@conf['ldap'], 'tls_key_file') %>
 # Valid values: never, hard, demand, allow, try
-#tls_require_cert =
+<%= Dovecot::Conf.attribute(@conf['ldap'], 'tls_require_cert') %>
 
 # Use the given ldaprc path.
-#ldaprc_path =
+<%= Dovecot::Conf.attribute(@conf['ldap'], 'ldaprc_path') %>
 
 # LDAP library debug level as specified by LDAP_DEBUG_* in ldap_log.h.
 # -1 = everything. You may need to recompile OpenLDAP with debugging enabled
 # to get enough output.
-#debug_level = 0
+<%= Dovecot::Conf.attribute(@conf['ldap'], 'debug_level', 0) %>
 
 # Use authentication binding for verifying password's validity. This works by
 # logging into LDAP server using the username and password given by client.
 # The pass_filter is used to find the DN for the user. Note that the pass_attrs
 # is still used, only the password field is ignored in it. Before doing any
 # search, the binding is switched back to the default DN.
-#auth_bind = no
+<%= Dovecot::Conf.attribute(@conf['ldap'], 'auth_bind', false) %>
 
 # If authentication binding is used, you can save one LDAP request per login
 # if users' DN can be specified with a common template. The template can use
@@ -80,20 +81,20 @@
 # For example:
 #   auth_bind_userdn = cn=%u,ou=people,o=org
 #
-#auth_bind_userdn =
+<%= Dovecot::Conf.attribute(@conf['ldap'], 'auth_bind_userdn') %>
 
 # LDAP protocol version to use. Likely 2 or 3.
-#ldap_version = 3
+<%= Dovecot::Conf.attribute(@conf['ldap'], 'ldap_version', 3) %>
 
 # LDAP base. %variables can be used here.
 # For example: dc=mail, dc=example, dc=org
 base =
 
 # Dereference: never, searching, finding, always
-#deref = never
+<%= Dovecot::Conf.attribute(@conf['ldap'], 'deref', 'never') %>
 
 # Search scope: base, onelevel, subtree
-#scope = subtree
+<%= Dovecot::Conf.attribute(@conf['ldap'], 'scope', 'subtree') %>
 
 # User attributes are given in LDAP-name=dovecot-internal-name list. The
 # internal names are:
@@ -104,14 +105,14 @@ base =
 #
 # There are also other special fields which can be returned, see
 # http://wiki2.dovecot.org/UserDatabase/ExtraFields
-#user_attrs = homeDirectory=home,uidNumber=uid,gidNumber=gid
+<%= Dovecot::Conf.attribute(@conf['ldap'], 'user_attrs', 'homeDirectory=home,uidNumber=uid,gidNumber=gid') %>
 
 # Filter for user lookup. Some variables can be used (see
 # http://wiki2.dovecot.org/Variables for full list):
 #   %u - username
 #   %n - user part in user@domain, same as %u if there's no domain
 #   %d - domain part in user@domain, empty if user there's no domain
-#user_filter = (&(objectClass=posixAccount)(uid=%u))
+<%= Dovecot::Conf.attribute(@conf['ldap'], 'user_filter', '(&(objectClass=posixAccount)(uid=%u))') %>
 
 # Password checking attributes:
 #  user: Virtual user name (user@domain), if you wish to change the
@@ -119,22 +120,22 @@ base =
 #  password: Password, may optionally start with {type}, eg. {crypt}
 # There are also other special fields which can be returned, see
 # http://wiki2.dovecot.org/PasswordDatabase/ExtraFields
-#pass_attrs = uid=user,userPassword=password
+<%= Dovecot::Conf.attribute(@conf['ldap'], 'pass_attrs', 'uid=user,userPassword=password') %>
 
 # If you wish to avoid two LDAP lookups (passdb + userdb), you can use
 # 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:
-#pass_attrs = uid=user,userPassword=password,\
+<%= Dovecot::Conf.attribute(@conf['ldap'], 'pass_attrs', 'uid=user,userPassword=password,\') %>
 #  homeDirectory=userdb_home,uidNumber=userdb_uid,gidNumber=userdb_gid
 
 # Filter for password lookups
-#pass_filter = (&(objectClass=posixAccount)(uid=%u))
+<%= Dovecot::Conf.attribute(@conf['ldap'], 'pass_filter', '(&(objectClass=posixAccount)(uid=%u))') %>
 
 # Attributes and filter to get a list of all users
-#iterate_attrs = uid=user
-#iterate_filter = (objectClass=posixAccount)
+<%= Dovecot::Conf.attribute(@conf['ldap'], 'iterate_attrs', 'uid=user') %>
+<%= Dovecot::Conf.attribute(@conf['ldap'], 'iterate_filter', '(objectClass=posixAccount)') %>
 
 # Default password scheme. "{scheme}" before password overrides this.
 # List of supported schemes is in: http://wiki2.dovecot.org/Authentication
-#default_pass_scheme = CRYPT
+<%= Dovecot::Conf.attribute(@conf['ldap'], 'default_pass_scheme', 'CRYPT') %>

templates/default/dovecot-sql.conf.ext.erb

@@ -26,7 +26,7 @@
 # );
 
 # Database driver: mysql, pgsql, sqlite
-#driver = 
+<%= Dovecot::Conf.attribute(@conf['sql'], 'driver') %>
 
 # Database connection string. This is driver-specific setting.
 #
@@ -63,14 +63,14 @@
 #   connect = host=sql.example.com dbname=virtual user=virtual password=blarg
 #   connect = /etc/dovecot/authdb.sqlite
 #
-#connect =
+<%= Dovecot::Conf.attribute(@conf['sql'], 'connect') %>
 
 # Default password scheme.
 #
 # List of supported schemes is in
 # http://wiki2.dovecot.org/Authentication/PasswordSchemes
 #
-#default_pass_scheme = MD5
+<%= Dovecot::Conf.attribute(@conf['sql'], 'default_pass_scheme', 'MD5') %>
 
 # passdb query to retrieve the password. It can return fields:
 #   password - The user's password. This field must be returned.
@@ -102,6 +102,7 @@
 #password_query = \
 #  SELECT username, domain, password \
 #  FROM users WHERE username = '%n' AND domain = '%d'
+<%= Dovecot::Conf.attribute(@conf['sql'], 'password_query') %>
 
 # userdb query to retrieve the user information. It can return fields:
 #   uid - System UID (overrides mail_uid setting)
@@ -122,6 +123,7 @@
 #user_query = \
 #  SELECT home, uid, gid \
 #  FROM users WHERE username = '%n' AND domain = '%d'
+<%= Dovecot::Conf.attribute(@conf['sql'], 'user_query') %>
 
 # If you wish to avoid two SQL lookups (passdb + userdb), you can use
 # userdb prefetch instead of userdb sql in dovecot.conf. In that case you'll
@@ -134,3 +136,4 @@
 
 # Query to get a list of all usernames.
 #iterate_query = SELECT username AS user FROM users
+<%= Dovecot::Conf.attribute(@conf['sql'], 'iterate_query') %>