X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=09ce6a0b6b74ce634dbfcac36f2880af70f4bf13;hb=db14d5ab5528a3d2be5b8e32ba4ce4ca28963bdc;hp=d25138fb6bc53f8dc57520e7fc9452534c6063bc;hpb=def5cc4e6d4d2409d32f9eca4281d7a15a105843;p=mirror%2Fdsa-puppet.git diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb index d25138fb6..09ce6a0b6 100644 --- a/modules/samhain/templates/samhainrc.erb +++ b/modules/samhain/templates/samhainrc.erb @@ -104,6 +104,12 @@ file=/etc/bind/geodns/recvconf.files file=/etc/bind/named.conf.options <% end -%> file=/etc/apache2/conf.d/puppet-builddlist +<% 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 @@ -156,6 +162,10 @@ file=/etc/ferm/dsa.d file=/etc/rc.local file=/etc/unbound file=/etc/dsa +<% if scope.lookupvar('site::nodeinfo')['static_mirror'] or scope.lookupvar('site::nodeinfo')['static_source'] or scope.lookupvar('site::nodeinfo')['static_master'] -%> +file=/etc/ssh/userkeys +file=/etc/ssh/userkeys/staticsync +<% end -%> [LogFiles] ##