Skip to content

Add ldap configs and get a more generic template #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kronos-pbrideau wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Add ldap configs and get a more generic template #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
30ed1d5
Convert dovecot-ldap.conf.ext as unix file
kronos-pbrideau Jul 28, 2015
fc1afd9
Add tls extension for ldap connection
kronos-pbrideau Jul 28, 2015
91f8a33
Use configs in dovecot::mail for ldap static configs
kronos-pbrideau Jul 28, 2015
0255d28
Add uris definition (ldaps://xxx) and refactor TLS configs
kronos-pbrideau Jul 30, 2015
60ea138
Set userdb static and user_attrs as puppet variables
kronos-pbrideau Jul 30, 2015
4d36663
Disable configs with false in template
kronos-pbrideau Jul 30, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion manifests/ldap.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,40 @@
# auth-ldap.conf.ext
class dovecot::ldap (
$ldap_hosts = 'ldap.example.org:389',
$ldap_uris = false,
$ldap_dn = 'cn=vmail,cn=users,dc=example,dc=org',
$ldap_dnpass = 'NotPassword#1234!',
$ldap_auth_bind_userdn = 'cn=%n,cn=users,dc=example,dc=org',
$ldap_base = 'cn=users,dc=example,dc=org',
$ldap_auth_bind = 'no',
$ldap_scope = 'subtree',
$ldap_debug_level = '-1',
$ldap_userdb_static = 'uid=vmail gid=vmail home=/srv/vmail/%n mail=maildir:~/mail',
$ldap_user_filter = '(&(objectClass=user)(cn=%n))',
$ldap_user_attrs = '=home=/srv/vmail/%d/%n, =uid=vmail, =gid=vmail, =mail=maildir:~/mail',
$ldap_pass_filter = '(&(objectClass=user)(cn=%n))',
$ldap_pass_attrs = 'cn=user', #cn is ldap attribute name, user is dovecot field
$ldap_iterate_attrs = 'cn=user',
$ldap_iterate_filter = '(objectClass=user)'
$ldap_iterate_filter = '(objectClass=user)',
$ldap_tls = 'no',
$ldap_tls_ca_cert_file = false,
$ldap_tls_ca_cert_dir = false,
$ldap_tls_cipher_suite = false,
$ldap_tls_cert_file = false,
$ldap_tls_key_file = false,
$ldap_tls_require_cert = 'demand',
) {

if $ldap_uris and $ldap_hosts {
fail('uris and hosts are mutually exclusives')
}

package {'dovecot-ldap':
ensure => installed,
before => Exec['dovecot'],
notify => Service['dovecot']
}

# TODO the next two files use same template, probably should be creating symlink....
file { '/etc/dovecot/dovecot-ldap.conf.ext':
ensure => present,
Expand Down
14 changes: 9 additions & 5 deletions templates/auth-ldap.conf.ext
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,17 @@ passdb {
# lookup by using userdb static instead of userdb ldap, for example:
# <doc/wiki/UserDatabase.Static.txt>
#these values for home and mail override mail_home and mail_location
<%- if @ldap_userdb_static -%>
userdb {
driver = static
#args = uid=vmail gid=vmail home=/srv/vmail/%d/%n mail=maildir:~/mail
# not using domain in mail home b/c domain is stripped by "auth_username_format = %Ln" and
# we don't know how to look up username in ldap
args = uid=vmail gid=vmail home=/srv/vmail/%n mail=maildir:~/mail
args = <%= @ldap_userdb_static %>
}
<%- else -%>
#userdb {
# driver = static
# args =
#}
<%- end -%>
#userdb {
# driver = prefetch
#}
Expand All @@ -40,4 +44,4 @@ userdb {
userdb {
driver = ldap
args = /etc/dovecot/dovecot-ldap-userdb.conf.ext
}
}
Loading