projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make the www.d.o apache config a template
[mirror/dsa-puppet.git]
/
modules
/
samhain
/
templates
/
samhainrc.erb
diff --git
a/modules/samhain/templates/samhainrc.erb
b/modules/samhain/templates/samhainrc.erb
index
d4d3355
..
8a8b2bf
100644
(file)
--- a/
modules/samhain/templates/samhainrc.erb
+++ b/
modules/samhain/templates/samhainrc.erb
@@
-107,6
+107,9
@@
file=/etc/apache2/conf.d/puppet-builddlist
<% if classes.include?("roles::static_base") -%>
file=/etc/static-components.conf
<% end -%>
<% if classes.include?("roles::static_base") -%>
file=/etc/static-components.conf
<% end -%>
+<% if classes.include?("roles::static_mirror") -%>
+file=/etc/apache2/sites-available/static-vhosts-simple
+<% end -%>
#
# There are files in /etc that might change, thus changing the directory
#
# There are files in /etc that might change, thus changing the directory
@@
-430,6
+433,10
@@
file=/etc/ferm/conf.d/defs.conf
file=/etc/ferm/ferm.conf
dir=2/etc/ssl/debian
file=/etc/unbound/unbound.conf
file=/etc/ferm/ferm.conf
dir=2/etc/ssl/debian
file=/etc/unbound/unbound.conf
+<% if scope.lookupvar('::fqdn') == "draghi.debian.org" -%>
+file=/etc/openvpn/deb-mgmt-clients.pool
+<% end -%>
+
<% if scope.lookupvar('site::nodeinfo')['puppetmaster'] %>
<% if scope.lookupvar('site::nodeinfo')['puppetmaster'] %>