Use puppet certificates in ejabberd by default
This commit is contained in:
parent
12791c5891
commit
5f06698dbd
1 changed files with 39 additions and 33 deletions
|
@ -78,7 +78,13 @@ class ejabberd {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if $ejabberd_ssl_key and $ejabberd_ssl_cert {
|
if !$ejabberd_ssl_key {
|
||||||
|
$ejabberd_ssl_key = "${puppet_ssldir}/private_keys/${homename}.pem"
|
||||||
|
}
|
||||||
|
if !$ejabberd_ssl_cert {
|
||||||
|
$ejabberd_ssl_cert = "${puppet_ssldir}/certs/${homename}.pem"
|
||||||
|
}
|
||||||
|
|
||||||
file { "${cert_prefix}/private/ejabberd.key":
|
file { "${cert_prefix}/private/ejabberd.key":
|
||||||
ensure => present,
|
ensure => present,
|
||||||
source => $ejabberd_ssl_key,
|
source => $ejabberd_ssl_key,
|
||||||
|
@ -108,6 +114,7 @@ class ejabberd {
|
||||||
} else {
|
} else {
|
||||||
$cert_files = "private/ejabberd.key certs/ejabberd.crt"
|
$cert_files = "private/ejabberd.key certs/ejabberd.crt"
|
||||||
}
|
}
|
||||||
|
|
||||||
exec { "generate-ejabberd-pem":
|
exec { "generate-ejabberd-pem":
|
||||||
path => "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin",
|
path => "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin",
|
||||||
cwd => $cert_prefix,
|
cwd => $cert_prefix,
|
||||||
|
@ -117,7 +124,6 @@ class ejabberd {
|
||||||
require => Package["ejabberd"],
|
require => Package["ejabberd"],
|
||||||
notify => Service["ejabberd"],
|
notify => Service["ejabberd"],
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
file { "/etc/ejabberd/ejabberd.pem":
|
file { "/etc/ejabberd/ejabberd.pem":
|
||||||
ensure => present,
|
ensure => present,
|
||||||
|
|
Loading…
Add table
Reference in a new issue