projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove dacs
[mirror/dsa-puppet.git]
/
modules
/
samhain
/
templates
/
samhainrc.erb
diff --git
a/modules/samhain/templates/samhainrc.erb
b/modules/samhain/templates/samhainrc.erb
index
138113b
..
0c7b04e
100644
(file)
--- a/
modules/samhain/templates/samhainrc.erb
+++ b/
modules/samhain/templates/samhainrc.erb
@@
-110,6
+110,9
@@
file=/etc/static-clients.conf
<% elsif classes.include?("roles::static_source") -%>
file=/etc/static-clients.conf
<% end -%>
<% elsif classes.include?("roles::static_source") -%>
file=/etc/static-clients.conf
<% end -%>
+<% if classes.include?("apache2") -%>
+file=/etc/apache2/conf-available/puppet-ssl-key-pins.conf
+<% end -%>
file=/etc/multipath/wwids
#
file=/etc/multipath/wwids
#
@@
-126,9
+129,11
@@
file=/etc/init.d/.depend.start
file=/etc/init.d/.depend.stop
# These are the directories for the files we handle with puppet
file=/etc/init.d/.depend.stop
# These are the directories for the files we handle with puppet
-file=/etc/apache2/conf.d
+<% if classes.include?("apache2") -%>
+file=/etc/apache2/conf-available
files=/etc/apache2/mods-enabled
files=/etc/apache2/sites-available
files=/etc/apache2/mods-enabled
files=/etc/apache2/sites-available
+<% end -%>
file=/etc/bacula
file=/etc/samhain
file=/etc/munin
file=/etc/bacula
file=/etc/samhain
file=/etc/munin
@@
-174,7
+179,7
@@
file=/etc/rabbitmq
file=/etc/ssh/userkeys
file=/etc/ssh/userkeys/staticsync
<% end -%>
file=/etc/ssh/userkeys
file=/etc/ssh/userkeys/staticsync
<% end -%>
-file=/etc/rsync
+file=/etc/rsync
d
[LogFiles]
##
[LogFiles]
##
@@
-241,6
+246,7
@@
file=/etc/resolv.conf
<% if scope.lookupvar('site::nodeinfo')['buildd'] -%>
file=/etc/dupload.conf
file=/etc/buildd/buildd.conf
<% if scope.lookupvar('site::nodeinfo')['buildd'] -%>
file=/etc/dupload.conf
file=/etc/buildd/buildd.conf
+file=/etc/sbuild/sbuild.conf
<% end -%>
file=/etc/resolv.conf.pcmcia.save
file=/etc/nologin
<% end -%>
file=/etc/resolv.conf.pcmcia.save
file=/etc/nologin
@@
-376,7
+382,6
@@
file=/etc/apt/apt.conf.d/local-recommends
file=/etc/apt/apt.conf.d/local-pdiffs
file=/etc/apt/apt.conf.d/local-ssl-ca-global
file=/etc/apt/preferences.d/buildd
file=/etc/apt/apt.conf.d/local-pdiffs
file=/etc/apt/apt.conf.d/local-ssl-ca-global
file=/etc/apt/preferences.d/buildd
-file=/etc/systemd/system/puppet.service
file=/etc/puppet/puppet.conf
file=/etc/default/puppet
file=/etc/default/postgrey
file=/etc/puppet/puppet.conf
file=/etc/default/puppet
file=/etc/default/postgrey