tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moved saslauthd module contents to sasl module and added deprecation warning to saslauthd module.

Browse source
This commit is contained in:
Timo Mkinen 2012-06-20 09:54:10 +03:00
parent 6d58857fe5
commit f0aec76e50
3 changed files with 101 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

1
saslauthd/files/service.conf
View file

@ -1 +0,0 @@
pwcheck_method:saslauthd

63
saslauthd/manifests/init.pp
View file

@ -7,48 +7,8 @@
#
class saslauthd::server {
package { "cyrus-sasl":
ensure => installed,
}
case $saslauthd_mech {
"","pam": { }
"kerberos5": {
package { "cyrus-sasl-gssapi":
ensure => installed,
before => Service["saslauthd"],
}
augeas { "set-saslauthd-mech":
context => "/files/etc/sysconfig/saslauthd",
changes => "set MECH kerberos5",
require => Package["cyrus-sasl"],
notify => Service["saslauthd"],
}
}
default: {
fail("Unknown mechanism ${saslauthd_mech} for saslauthd::server")
}
}
service { "saslauthd":
ensure => running,
enable => true,
require => Package["cyrus-sasl"],
}
file { "/etc/sasldb2":
ensure => present,
mode => "0644",
owner => "root",
group => "root",
require => Exec["generate-sasldb2"],
}
exec { "generate-sasldb2":
command => "saslpasswd2 -d foobar ; true",
path => "/bin:/usr/bin:/sbin:/usr/sbin",
creates => "/etc/sasldb2",
require => Package["cyrus-sasl"],
}
require sasl::saslauthd
notice("Deprecation notice: saslauthd::server is deprecated, use sasl::saslauthd instead")
}
@ -66,22 +26,7 @@ class saslauthd::server {
#
define saslauthd::service() {
case $architecture {
"i386": { $libdir = "/usr/lib/sasl2" }
"x86_64": { $libdir = "/usr/lib64/sasl2" }
default: { fail("Unknown architecture ${architecture}") }
}
file { "${libdir}/${name}.conf":
ensure => present,
source => [ "puppet:///files/saslauthd/${name}.${fqdn}.conf",
"puppet:///files/saslauthd/${name}.conf",
"puppet:///files/saslauthd/service.conf",
"puppet:///modules/saslauthd/service.conf", ],
mode => "0644",
owner => "root",
group => "root",
require => Service["saslauthd"],
}
sasl::saslauthd::service { $name: }
notice("Deprecation notice: saslauthd::service is deprecated, use sasl::saslauthd::service instead")
}