projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Split bacula_director_address into bacula_director_address and bacula_director_ip
[mirror/dsa-puppet.git]
/
modules
/
bacula
/
manifests
/
director.pp
diff --git
a/modules/bacula/manifests/director.pp
b/modules/bacula/manifests/director.pp
index
b3fc7a5
..
f3d6f68
100644
(file)
--- a/
modules/bacula/manifests/director.pp
+++ b/
modules/bacula/manifests/director.pp
@@
-11,6
+11,13
@@
class bacula::director inherits bacula {
require => Package['bacula-director-pgsql']
}
require => Package['bacula-director-pgsql']
}
+ exec { 'bacula-director reload':
+ path => '/usr/bin:/usr/sbin:/bin:/sbin',
+ command => 'service bacula-director reload',
+ refreshonly => true,
+ }
+
+
file { '/etc/bacula/conf.d':
ensure => directory,
mode => '0755',
file { '/etc/bacula/conf.d':
ensure => directory,
mode => '0755',
@@
-19,7
+26,7
@@
class bacula::director inherits bacula {
force => true,
recurse => true,
source => 'puppet:///files/empty/',
force => true,
recurse => true,
source => 'puppet:///files/empty/',
- notify =>
Service['bacula-director
']
+ notify =>
Exec['bacula-director reload
']
}
file { '/etc/bacula/bacula-dir.conf':
}
file { '/etc/bacula/bacula-dir.conf':
@@
-27,13
+34,13
@@
class bacula::director inherits bacula {
mode => '0440',
group => bacula,
require => Package['bacula-director-pgsql'],
mode => '0440',
group => bacula,
require => Package['bacula-director-pgsql'],
- notify =>
Service['bacula-director
']
+ notify =>
Exec['bacula-director reload
']
}
@ferm::rule { 'dsa-bacula-dir':
}
@ferm::rule { 'dsa-bacula-dir':
- domain => '(ip
ip6
)',
+ domain => '(ip)',
description => 'Allow bacula access from localhost',
description => 'Allow bacula access from localhost',
- rule => "proto tcp mod state state (NEW) dport (bacula-dir) saddr (${bacula_director_
address
} localhost) ACCEPT",
+ rule => "proto tcp mod state state (NEW) dport (bacula-dir) saddr (${bacula_director_
ip
} localhost) ACCEPT",
}
file { '/etc/bacula/conf.d/empty.conf':
}
file { '/etc/bacula/conf.d/empty.conf':
@@
-41,9
+48,19
@@
class bacula::director inherits bacula {
mode => '0440',
group => bacula,
require => Package['bacula-director-pgsql'],
mode => '0440',
group => bacula,
require => Package['bacula-director-pgsql'],
- notify =>
Service['bacula-director
']
+ notify =>
Exec['bacula-director reload
']
}
Bacula::Node<<| |>>
}
Bacula::Node<<| |>>
+ package { 'bacula-console':
+ ensure => installed;
+ }
+
+ file { '/etc/bacula/bconsole.conf':
+ content => template('bacula/bconsole.conf.erb'),
+ mode => '0640',
+ group => bacula,
+ require => Package['bacula-console']
+ }
}
}