X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=8b3a3e8eaa06ba92804f10ed6c657c22a19ba96c;hb=c8170df632aadaff128b03294952ba818bedda82;hp=8f31378cf3eb2bd78e3e8dfaea6467c3f86c0bf6;hpb=3bfd10b2f5ebe131a16bf540e7d0f8de4fe17988;p=mirror%2Fdsa-puppet.git diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb index 8f31378cf..8b3a3e8ea 100644 --- a/modules/samhain/templates/samhainrc.erb +++ b/modules/samhain/templates/samhainrc.erb @@ -67,9 +67,7 @@ # RedefIgnoreNone=(no default) # RedefUser0=(no default) # RedefUser1=(no default) -<% if scope.lookupvar('site::nodeinfo')['buildd'] -%> IgnoreMissing=/etc/lvm/archive/.*.vg -<% end -%> [Attributes] ## @@ -104,6 +102,9 @@ 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_mirror") -%> +file=/etc/apache2/sites-available/static-vhosts-simple +<% end -%> # # There are files in /etc that might change, thus changing the directory @@ -118,11 +119,13 @@ file=/etc/spamassassin/sa-update-keys # These are the directories for the files we handle with puppet file=/etc/apache2/conf.d files=/etc/apache2/mods-enabled +files=/etc/apache2/sites-available file=/etc/bacula file=/etc/samhain file=/etc/munin file=/etc/munin/plugins file=/etc/munin/plugin-conf.d +file=/etc/munin/munin-conf.d file=/etc/exim4 file=/etc/exim4/ssl file=/etc/apt @@ -146,6 +149,7 @@ file=/usr/sbin file=/etc/monit file=/etc/monit/monit.d file=/etc/pam.d +file=/etc/schroot/default file=/etc/sysctl.d file=/etc/syslog-ng file=/etc/stunnel @@ -155,13 +159,10 @@ file=/etc/ferm/dsa.d file=/etc/rc.local file=/etc/unbound file=/etc/dsa -<% if scope.lookupvar('site::nodeinfo')['puppetmaster'] %> - -# Damn you rails apps and your shoddy packaging -file=/usr/share/puppet-dashboard/public/stylesheets -file=/usr/share/puppet-dashboard/public/javascripts -file=/usr/share/puppet-dashboard/public/stylesheets/all.css -file=/usr/share/puppet-dashboard/public/javascripts/all.js +file=/etc/rabbitmq +<% 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] @@ -244,12 +245,16 @@ file=/etc/blkid.tab.old file=/etc/resolv.conf.dhclient-new # We handle these files with puppet - please to not be bothering us +file=/etc/nsswitch.conf file=/etc/timezone file=/etc/motd.tail +file=/etc/update-motd.d/ +file=/etc/update-motd.d/puppet-motd file=/etc/ntp.conf file=/etc/samhain/samhainrc file=/etc/munin/munin-node.conf file=/etc/munin/plugin-conf.d/munin-node +dir=2/etc/munin/munin-conf.d file=/etc/userdir-ldap.confc file=/etc/exim4/blacklist file=/etc/exim4/host_blacklist @@ -264,16 +269,24 @@ file=/etc/exim4/rbllist file=/etc/exim4/rhsbllist file=/etc/exim4/submission-domains file=/etc/exim4/virtualdomains +file=/etc/exim4/email-virtualdomains file=/etc/exim4/whitelist file=/etc/exim4/local-settings.conf file=/etc/exim4/ssl/ca.crt file=/etc/exim4/ssl/ca.crl file=/etc/exim4/ssl/thishost.crt file=/etc/exim4/ssl/thishost.key +dir=3/etc/exim4/email-virtualdomains file=/etc/ssh/ssh_config file=/etc/ssh/sshd_config file=/etc/dsa/cron.ignore.dsa-puppet-stuff file=/etc/vsftpd.conf +file=/etc/aliases +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'] @@ -321,7 +334,7 @@ file=/etc/munin/plugins/exim_mailqueue file=/etc/munin/plugins/exim_mailstats file=/etc/munin/plugins/postfix_mailqueue file=/etc/munin/plugins/postfix_mailvolume -file=/etc/apache2/conf.d/ressource-limits +file=/etc/apache2/conf.d/resource-limits file=/etc/apache2/mods-enabled/info.conf file=/etc/apache2/mods-enabled/info.load file=/etc/apache2/mods-enabled/server.conf @@ -350,7 +363,6 @@ file=/etc/apt/preferences.d/buildd file=/etc/puppet/puppet.conf file=/etc/default/puppet file=/etc/default/postgrey -file=/etc/default/schroot file=/etc/default/syslog-ng file=/etc/logrotate.d/exim4-paniclog file=/etc/logrotate.d/exim4-base @@ -382,6 +394,7 @@ file=/usr/lib/nagios/plugins/dsa-check-raid-sw file=/usr/lib/nagios/plugins/dsa-update-samhain-status file=/etc/sudoers file=/etc/stunnel/puppet-ekeyd-peer.pem +file=/etc/stunnel/puppet-ekeyd.conf file=/etc/sysctl.d/mmap_min_addr.conf file=/etc/pam.d/sudo file=/etc/monit/monitrc @@ -390,6 +403,9 @@ file=/etc/monit/monit.d/00debian.org file=/etc/cron.d/dsa-puppet-stuff file=/etc/cron.d/dsa-buildd file=/etc/cron.weekly/stunnel-ekey-restart +file=/etc/default/schroot +file=/etc/schroot/default/nssdatabases + <% if scope.lookupvar('site::nodeinfo')['nagiosmaster'] -%> file=/etc/nagios3/puppetconf.d/auto-hostgroups.cfg file=/etc/nagios3/puppetconf.d/auto-hosts.cfg @@ -413,12 +429,8 @@ dir=1/etc/bind/geodns dir=1/etc/bind file=/etc/bind/named.conf.debian-zones <% end -%> -<% if scope.lookupvar('::fqdn') == "dijkstra.debian.org" -%> -dir=4/etc/dsa-kvm -<% end -%> -<% if scope.lookupvar('site::nodeinfo')['buildd'] -%> -dir=3/etc/lvm -<% end -%> +dir=3/etc/lvm/archive +dir=3/etc/lvm/backup dir=1/etc/ferm/dsa.d dir=1/etc/ferm/conf.d dir=3/etc/facter @@ -426,7 +438,22 @@ file=/etc/ferm/conf.d/me.conf file=/etc/ferm/conf.d/defs.conf file=/etc/ferm/ferm.conf dir=2/etc/ssl/debian +dir=1/etc/ssl/certs +dir=1/etc/ssl/servicecerts 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'] %> + +# Damn you rails apps and your shoddy packaging +file=/usr/share/puppet-dashboard/public/stylesheets +file=/usr/share/puppet-dashboard/public/javascripts +file=/usr/share/puppet-dashboard/public/stylesheets/all.css +file=/usr/share/puppet-dashboard/public/javascripts/all.js +<% end -%> [IgnoreNone] ##