projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9d4afa9
)
ignore changes to /etc/apache2/conf-available/puppet-ssl-key-pins.conf
author
Peter Palfrader
<peter@palfrader.org>
Fri, 23 Sep 2016 20:42:53 +0000
(22:42 +0200)
committer
Peter Palfrader
<peter@palfrader.org>
Fri, 23 Sep 2016 20:43:06 +0000
(22:43 +0200)
modules/samhain/templates/samhainrc.erb
patch
|
blob
|
history
diff --git
a/modules/samhain/templates/samhainrc.erb
b/modules/samhain/templates/samhainrc.erb
index
556ab20
..
f9e76c0
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 -%>
+<% if classes.include?("apache2") -%>
+file=/etc/apache2/conf-available/puppet-ssl-key-pins.conf
+<% end -%>
file=/etc/multipath/wwids
#