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

bacula: Sync SELinux contexts with CentOS 6.6 and change mail command to use bacula's own bsmtp to prevent SELinux errors.

Browse source
This commit is contained in:
Timo Makinen 2014-11-21 10:54:27 +02:00
parent bb84d8b7da
commit 9ae45e3fef
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
bacula/manifests/init.pp
View file

@ -215,11 +215,11 @@ class bacula::director($password=undef,
mode => "0770", mode => "0770",
owner => "bacula", owner => "bacula",
group => "bacula", group => "bacula",
seltype => "var_spool_t", seltype => "bacula_spool_t",
require => Package["bacula-director"], require => Package["bacula-director"],
} }
selinux::manage_fcontext { "${datadir}(/.*)?": selinux::manage_fcontext { "${datadir}(/.*)?":
type => "var_spool_t", type => "bacula_spool_t",
before => File[$datadir], before => File[$datadir],
} }
if $datadir != "/srv/bacula" { if $datadir != "/srv/bacula" {
@ -228,11 +228,11 @@ class bacula::director($password=undef,
target => $datadir, target => $datadir,
owner => "bacula", owner => "bacula",
group => "bacula", group => "bacula",
seltype => "var_spool_t", seltype => "bacula_spool_t",
require => File[$datadir], require => File[$datadir],
} }
selinux::manage_fcontext { "/srv/bacula(/.*)?": selinux::manage_fcontext { "/srv/bacula(/.*)?":
type => "var_spool_t", type => "bacula_spool_t",
before => File[$datadir], before => File[$datadir],
} }
} }

4
bacula/templates/bacula-dir.conf.erb
View file

@ -15,8 +15,8 @@ Director {
Messages { Messages {
Name = "Standard" Name = "Standard"
MailCommand = "mail -s \"Bacula Message\" %r" MailCommand = "bsmtp -h <%= @mail_server %> -s \"Bacula Message\" %r"
OperatorCommand = "mail -s \"Bacula Operator Message\" %r" OperatorCommand = "bsmtp -h <%= @mail_server %> -s \"Bacula Operator Message\" %r"
mail = root = all, !skipped mail = root = all, !skipped
operator = root = mount operator = root = mount
append = "/var/log/bacula/bacula.log" = all, !skipped append = "/var/log/bacula/bacula.log" = all, !skipped

4
bacula/templates/bacula-sd.conf.erb
View file

@ -24,8 +24,8 @@ Director {
Messages { Messages {
Name = "Standard" Name = "Standard"
MailCommand = "mail -s \"Bacula Message\" %r" MailCommand = "bsmtp -h <%= @mail_server %> -s \"Bacula Message\" %r"
OperatorCommand = "mail -s \"Bacula Operator Message\" %r" OperatorCommand = "bsmtp -h <%= @mail_server %> -s \"Bacula Operator Message\" %r"
mail = root = all, !skipped, !info mail = root = all, !skipped, !info
operator = root = mount operator = root = mount
director = bacula-dir = all director = bacula-dir = all