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

Added mail domain to sendmail's submit.mc

Browse source
This commit is contained in:
Ossi Salmi 2010-12-26 19:38:00 +02:00 • committed by Timo Mkinen
parent f64c9540ca
commit 256e33721e
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sendmail/manifests/init.pp
View file

@ -2,6 +2,10 @@
# #
class sendmail::common { class sendmail::common {
if !$mail_domain and $domain {
$mail_domain = $domain
}
case $operatingsystem { case $operatingsystem {
centos,fedora: { centos,fedora: {
package { ["sendmail", "sendmail-cf"]: package { ["sendmail", "sendmail-cf"]:
@ -22,6 +26,10 @@ class sendmail::common {
# #
class sendmail::client inherits sendmail::common { class sendmail::client inherits sendmail::common {
if !$mail_server {
$mail_server = "127.0.0.1"
}
case $operatingsystem { case $operatingsystem {
openbsd: { openbsd: {
file { "/usr/share/sendmail/cf/submit.mc": file { "/usr/share/sendmail/cf/submit.mc":

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

@ -25,6 +25,9 @@ define(`_USE_DECNET_SYNTAX_', `1')dnl support DECnet
define(`confTIME_ZONE', `USE_TZ')dnl define(`confTIME_ZONE', `USE_TZ')dnl
define(`confDONT_INIT_GROUPS', `True')dnl define(`confDONT_INIT_GROUPS', `True')dnl
define(`confDIRECT_SUBMISSION_MODIFIERS',`C')dnl define(`confDIRECT_SUBMISSION_MODIFIERS',`C')dnl
<% if has_variable?('mail_domain') -%>
define(`confDOMAIN_NAME', `<%= mail_domain %>')dnl
<% end -%>
<% if kernel == 'Linux' -%> <% if kernel == 'Linux' -%>
define(`confPID_FILE', `/var/run/sm-client.pid')dnl define(`confPID_FILE', `/var/run/sm-client.pid')dnl
<% end -%> <% end -%>