Skip to content

Saslauthd config options #22

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
wolfaba wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Saslauthd config options #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
04d39dc
install sasldb package if auxprop plugin is sasldb
wolfaba Jan 10, 2024
a69f814
fix package name variable
wolfaba Jan 10, 2024
78e0e5a
saslauthd credential cache configuration
wolfaba Jan 11, 2024
7b22016
fix string
wolfaba Jan 11, 2024
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
3 changes: 3 additions & 0 deletions manifests/application.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,9 @@
$auxprop_package = $::sasl::auxprop_packages[$auxprop_plugin]
ensure_packages([$auxprop_package])
Package[$auxprop_package] -> File[$service_file]
if $auxprop_plugin == 'sasldb' {
ensure_packages([$::sasl::sasldb_package])
}
}
'saslauthd': {
# Require saslauthd if that's the method
Expand Down
3 changes: 3 additions & 0 deletions manifests/authd.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@
String $service_name = $::sasl::params::saslauthd_service,
Stdlib::Absolutepath $socket = $::sasl::params::saslauthd_socket,
Boolean $hasstatus = $::sasl::params::saslauthd_hasstatus,
Boolean $credcache = $::sasl::params::saslauthd_credcache,
Optional[Integer[0]] $credcache_timeout = undef,
Optional[Integer[0]] $credcache_size = undef,
# ldap
Optional[Stdlib::Absolutepath] $ldap_conf_file = $::sasl::params::saslauthd_ldap_conf_file,
Optional[Enum['bind', 'custom', 'fastbind']] $ldap_auth_method = undef,
Expand Down
15 changes: 15 additions & 0 deletions manifests/authd/config.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
$socket = $::sasl::authd::socket
$mechanism = $::sasl::authd::mechanism
$threads = $::sasl::authd::threads
$credcache = $::sasl::authd::credcache
$credcache_timeout = $::sasl::authd::credcache_timeout
$credcache_size = $::sasl::authd::credcache_size
$ldap_conf_file = $::sasl::authd::ldap_conf_file
$ldap_auth_method = $::sasl::authd::ldap_auth_method
$ldap_bind_dn = $::sasl::authd::ldap_bind_dn
Expand Down Expand Up @@ -54,6 +57,18 @@
default => '',
}

if $credcache {
$credcache_opt = '-c'
}

if $credcache_timeout {
$credcache_timeout_opt = "-t ${credcache_timeout}"
}

if $credcache_size {
$credcache_size_opt = "-s ${credcache_size}"
}

case $facts['os']['family'] {
'RedHat': {
if size($_mech_options) > 0 {
Expand Down
1 change: 1 addition & 0 deletions manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
$saslauthd_service = 'saslauthd'
$saslauthd_ldap_conf_file = '/etc/saslauthd.conf'
$saslauthd_threads = 5
$saslauthd_credcache = true

case $facts['os']['family'] {
'RedHat': {
Expand Down
2 changes: 1 addition & 1 deletion templates/default.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ NAME="saslauthd"
MECHANISMS="<%= @mechanism %>"
MECH_OPTIONS="<%= @mech_options %>"
THREADS=<%= @threads %>
OPTIONS="-c -m <%= @socket %>"
OPTIONS="<%= @credcache_opt %> <%= @credcache_timeout_opt %> <%= @credcache_size_opt %> -m <%= @socket %>"
2 changes: 1 addition & 1 deletion templates/sysconfig.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

SOCKETDIR="<%= @socket %>"
MECH="<%= @mechanism %>"
FLAGS="<%= @flags %>"
FLAGS="<%= @flags %> <%= @credcache_opt %> <%= @credcache_timeout_opt %> <%= @credcache_size_opt %>"