Skip to content
Snippets Groups Projects
Commit 90c85f18 authored by Adam Lewenberg's avatar Adam Lewenberg
Browse files

found some other ldap to su_ldap I missed before

parent fef0f15c
No related branches found
No related tags found
No related merge requests found
......@@ -12,14 +12,14 @@ traditional servers and containers.
### OpenLDAP Installation and Configuration ###
The main class `ldap` supports the installation of OpenLDAP and some of
its configuration. The simplest installation (which accepts all the
defaults):
OpenLDAP's configuration. The simplest installation (which accepts all the
defaults) is:
class { 'ldap':
}
This assumes installation on a traditional Debian server and will install
whichever version of OpenLDAP is current for the that version of Debian.
whichever version of OpenLDAP is current for that version of Debian.
#### Hosting Model
......@@ -41,8 +41,8 @@ the version of Debian underlying the host.
However, you can override this by using the `install_archive` and
`install_distro`. If the distribution you want to use is already in
included in `/etc/apt/sources.list.d` then use `install_dsitribution` to
specify the distribution:
included in the APT sources via `/etc/apt/sources.list.d` then use
`install_distribution` to specify the distribution:
# Use the "testing" distribution
class { 'ldap':
......@@ -50,9 +50,9 @@ specify the distribution:
}
If the distribution is _not_ already included in `/etc/apt/sources.list.d`
then you need also to use `install_repository`. This will add a `.list`
file into `/etc/apt/sources.list.d` that tells `apt` where to look for
the distribution.
then you can use `install_repository` to add a `.list` file to
`/etc/apt/sources.list.d` that tells `apt` where to look for the
distribution. For example,
# Use the "stretch-prod" distribution.
class { 'ldap':
......
......@@ -25,8 +25,7 @@ class su_ldap (
fail("Unknown hosting model ${hosting_model}")
}
## Install apt files/packages(?) so we load the correct version of OpenLDAP.
class { 'su_ldap::openldap_install':
}
include su_ldap::openldap_install
## Basic configuration: /etc/ldap/ldap.conf, /etc/default/slapd, et al.
class { 'su_ldap::config':
......
......@@ -13,13 +13,13 @@ class su_ldap::openldap_install (
# /etc/apt/sources.list.d.
if ($repository) {
file { '/etc/apt/sources.list.d/ldap':
content => template('ldap/etc/apt/sources.list.d/ldap.erb')
content => template('su_ldap/etc/apt/sources.list.d/ldap.erb')
}
}
# Pin some OpenLDAP packages.
file { '/etc/apt/preferences.d/ldap':
content => template('ldap/etc/apt/preferences.d/ldap.erb')
content => template('su_ldap/etc/apt/preferences.d/ldap.erb'),
notify => Exec['ldap aptitude update'];
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment