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

Merge branch 'master' of https://bitbucket.org/tmakinen/puppet

Browse source
This commit is contained in:
Ossi Herrala 2013-07-28 12:34:13 +00:00
commit f4bee85160
8 changed files with 88 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

17
sendmail/manifests/init.pp
View file

@ -29,15 +29,12 @@ class sendmail::common {
mode => "0644",
notify => Service["sendmail"],
}
$ostype = "linux"
$cabundle = "/etc/pki/tls/certs/ca-bundle.crt"
}
"ubuntu","debian": {
$ostype = "linux"
$cabundle = "/etc/ssl/certs/ca-certificates.crt"
}
"openbsd": {
$ostype = "openbsd"
$cabundle = "/etc/ssl/cert.pem"
}
default: {
@ -249,29 +246,31 @@ class sendmail::server inherits sendmail::common {
$ssl_chain = basename($sendmail_ssl_chain)
}
file { "/etc/pki/tls/private/${ssl_key}":
include ssl
file { "${ssl::private}/${ssl_key}":
ensure => present,
source => $sendmail_ssl_key,
mode => "0600",
owner => "root",
group => "root",
source => $sendmail_ssl_key,
notify => Service["sendmail"],
}
file { "/etc/pki/tls/certs/${ssl_cert}":
file { "${ssl::certs}/${ssl_cert}":
ensure => present,
source => $sendmail_ssl_cert,
mode => "0644",
owner => "root",
group => "root",
source => $sendmail_ssl_cert,
notify => Service["sendmail"],
}
if $ssl_chain {
file { "/etc/pki/tls/certs/${ssl_chain}":
file { "${ssl::certs}/${ssl_chain}":
ensure => present,
source => $sendmail_ssl_chain,
mode => "0644",
owner => "root",
group => "root",
source => $sendmail_ssl_chain,
notify => Service["sendmail"],
}
}

12
sendmail/templates/sendmail.mc.erb
View file

@ -8,7 +8,7 @@ include(`/usr/share/sendmail-cf/m4/cf.m4')dnl
include(`/usr/share/sendmail/cf/m4/cf.m4')dnl
<% end -%>
VERSIONID(`puppet sendmail::server')dnl
OSTYPE(`<%= @ostype -%>')dnl
OSTYPE(`<%= @kernel.downcase -%>')dnl
dnl #
<% if @mail_smart_host -%>
define(`SMART_HOST', `<%= @mail_smart_host -%>')dnl
@ -39,12 +39,12 @@ dnl #
define(`confCACERT_PATH', `/etc/mail/certs')
<% if @ssl_key and @ssl_cert -%>
<% if @ssl_chain -%>
define(`confCACERT', `/etc/pki/tls/certs/<%= @ssl_chain %>')
define(`confCACERT', `<%= scope.lookupvar('ssl::certs') %>/<%= @ssl_chain %>')
<% end -%>
define(`confSERVER_CERT', `/etc/pki/tls/certs/<%= @ssl_cert %>')
define(`confSERVER_KEY', `/etc/pki/tls/private/<%= @ssl_key %>')
define(`confCLIENT_CERT', `/etc/pki/tls/certs/<%= @ssl_cert %>')
define(`confCLIENT_KEY', `/etc/pki/tls/private/<%= @ssl_key %>')
define(`confSERVER_CERT', `<%= scope.lookupvar('ssl::certs') %>/<%= @ssl_cert %>')
define(`confSERVER_KEY', `<%= scope.lookupvar('ssl::private') %>/<%= @ssl_key %>')
define(`confCLIENT_CERT', `<%= scope.lookupvar('ssl::certs') %>/<%= @ssl_cert %>')
define(`confCLIENT_KEY', `<%= scope.lookupvar('ssl::private') %>/<%= @ssl_key %>')
<% end -%>
dnl #
FEATURE(`no_default_msa', `dnl')dnl

2
sendmail/templates/submit.mc.erb
View file

@ -22,7 +22,7 @@ include(`/usr/share/sendmail/cf/m4/cf.m4')dnl
DOMAIN(`debian-msp')dnl
<% end -%>
VERSIONID(`puppet setup')dnl
OSTYPE(`<%= @ostype -%>')dnl
OSTYPE(`<%= @kernel.downcase -%>')dnl
define(`confCF_VERSION', `Submit')dnl
define(`__OSTYPE__',`')dnl dirty hack to keep proto.m4 from complaining
define(`_USE_DECNET_SYNTAX_', `1')dnl support DECnet