projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This is redundant
[mirror/dsa-puppet.git]
/
modules
/
samhain
/
templates
/
samhainrc.erb
diff --git
a/modules/samhain/templates/samhainrc.erb
b/modules/samhain/templates/samhainrc.erb
index
7d57f4c
..
461f487
100644
(file)
--- a/
modules/samhain/templates/samhainrc.erb
+++ b/
modules/samhain/templates/samhainrc.erb
@@
-104,6
+104,11
@@
file=/etc/bind/named.conf.options
file=/etc/apache2/conf.d/puppet-builddlist
<% if classes.include?("roles::static_mirror") -%>
file=/etc/apache2/sites-available/static-vhosts-simple
file=/etc/apache2/conf.d/puppet-builddlist
<% if classes.include?("roles::static_mirror") -%>
file=/etc/apache2/sites-available/static-vhosts-simple
+file=/etc/static-clients.conf
+<% elsif classes.include?("roles::static_master") -%>
+file=/etc/static-clients.conf
+<% elsif classes.include?("roles::static_source") -%>
+file=/etc/static-clients.conf
<% end -%>
#
<% end -%>
#
@@
-285,6
+290,8
@@
file=/etc/aliases
file=/etc/multipath.conf
file=/etc/static-components.conf
file=/etc/rabbitmq/rabbitmq.config
file=/etc/multipath.conf
file=/etc/static-components.conf
file=/etc/rabbitmq/rabbitmq.config
+dir=/etc/bacula/storages-list.d
+dir=/etc/bacula/conf.d
<%=
out=""
if scope.lookupvar('site::nodeinfo')['heavy_exim']
<%=
out=""
if scope.lookupvar('site::nodeinfo')['heavy_exim']