X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=09903f656cfe7efc82f0d04a02f30cc4f8632a6d;hb=1cb9ef53251e8bb9324af5ea16ff399acb9571c1;hp=8b3a3e8eaa06ba92804f10ed6c657c22a19ba96c;hpb=c8170df632aadaff128b03294952ba818bedda82;p=dsa-puppet.git diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb index 8b3a3e8e..09903f65 100644 --- a/modules/samhain/templates/samhainrc.erb +++ b/modules/samhain/templates/samhainrc.erb @@ -104,6 +104,11 @@ file=/etc/bind/named.conf.options file=/etc/apache2/conf.d/puppet-builddlist <% if classes.include?("roles::static_mirror") -%> file=/etc/apache2/sites-available/static-vhosts-simple +file=/etc/static-clients.conf +<% elsif classes.include?("roles::static_master") -%> +file=/etc/static-clients.conf +<% elsif classes.include?("roles::static_source") -%> +file=/etc/static-clients.conf <% end -%> # @@ -115,6 +120,9 @@ file=/etc/ssh file=/etc/network/run file=/etc/bind/zones file=/etc/spamassassin/sa-update-keys +file=/etc/init.d/.depend.boot +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/apache2/conf.d @@ -138,7 +146,7 @@ file=/etc/nagios file=/etc/nagios/nrpe.d file=/etc/nagios/obsolete-packages-ignore.d file=/etc/bind/geodns -<% if scope.lookupvar('site::nodeinfo')['nagiosmaster'] -%> +<% if scope.function_has_role(['nagiosmaster']) -%> file=/etc/nagios3/puppetconf.d <% end -%> file=/etc/puppet @@ -150,6 +158,7 @@ file=/etc/monit file=/etc/monit/monit.d file=/etc/pam.d file=/etc/schroot/default +file=/etc/schroot/setup.d file=/etc/sysctl.d file=/etc/syslog-ng file=/etc/stunnel @@ -160,7 +169,7 @@ file=/etc/rc.local file=/etc/unbound file=/etc/dsa file=/etc/rabbitmq -<% if scope.lookupvar('site::nodeinfo')['static_mirror'] or scope.lookupvar('site::nodeinfo')['static_source'] or scope.lookupvar('site::nodeinfo')['static_master'] -%> +<% if scope.function_has_role(['static_mirror']) or scope.function_has_role(['static_source']) or scope.function_has_role(['static_master']) -%> file=/etc/ssh/userkeys file=/etc/ssh/userkeys/staticsync <% end -%> @@ -245,6 +254,7 @@ 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/dsa/pubsub.conf file=/etc/nsswitch.conf file=/etc/timezone file=/etc/motd.tail @@ -285,7 +295,9 @@ file=/etc/aliases file=/etc/multipath.conf file=/etc/static-components.conf file=/etc/rabbitmq/rabbitmq.config +file=/etc/rabbitmq/enabled_plugins dir=/etc/bacula/storages-list.d +dir=/etc/bacula/storage-conf.d dir=/etc/bacula/conf.d <%= out="" @@ -359,7 +371,9 @@ file=/etc/apt/sources.list.d/backports.org.list file=/etc/apt/apt.conf.d/local-compression 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/systemd/system/puppet.service file=/etc/puppet/puppet.conf file=/etc/default/puppet file=/etc/default/postgrey @@ -374,6 +388,7 @@ file=/etc/nagios/nrpe.d/nrpe_dsa.cfg file=/etc/nagios/nrpe.d/debianorg.cfg file=/etc/nagios/obsolete-packages-ignore file=/etc/nagios/obsolete-packages-ignore.d/hostspecific +file=/etc/nagios/check-libs.conf file=/usr/lib/nagios/plugins/dsa-check-packages file=/usr/lib/nagios/plugins/dsa-check-soas file=/usr/lib/nagios/plugins/dsa-check-mirrorsync @@ -405,8 +420,11 @@ file=/etc/cron.d/dsa-buildd file=/etc/cron.weekly/stunnel-ekey-restart file=/etc/default/schroot file=/etc/schroot/default/nssdatabases +file=/etc/schroot/setup.d/99porterbox-extra-sources +file=/etc/schroot/setup.d/99porterbox-extra-apt-options +file=/etc/openvswitch/conf.db -<% if scope.lookupvar('site::nodeinfo')['nagiosmaster'] -%> +<% if scope.function_has_role(['nagiosmaster']) -%> file=/etc/nagios3/puppetconf.d/auto-hostgroups.cfg file=/etc/nagios3/puppetconf.d/auto-hosts.cfg file=/etc/nagios3/puppetconf.d/auto-services.cfg @@ -416,10 +434,10 @@ file=/etc/nagios3/puppetconf.d/auto-serviceextinfo.cfg file=/etc/nagios3/puppetconf.d/auto-servicegroups.cfg file=/etc/nagios3/puppetconf.d/contacts.cfg <% end -%> -<% if scope.lookupvar('site::nodeinfo')['muninmaster'] -%> +<% if scope.function_has_role(['muninmaster']) -%> file=/etc/munin/munin.conf <% end -%> -<% if scope.lookupvar('site::nodeinfo')['puppetmaster'] -%> +<% if scope.function_has_role(['puppetmaster']) -%> dir=8/etc/puppet <% end -%> <% if classes.include?('named::geodns') -%> @@ -439,20 +457,30 @@ 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 +dir=1/etc/ssl/ca-debian +dir=1/etc/ssl/ca-global +file=/etc/ca-certificates.conf +file=/etc/ca-certificates-debian.conf +file=/etc/ca-certificates-global.conf +file=/etc/ssl/private/ssl-cert-snakeoil.key 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.function_has_role(['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 +dir=1/usr/share/puppet-dashboard/tmp/pids +<% end -%> + +<% if classes.include?("porterbox") %> +file=/etc/cron.weekly/puppet-mail-big-homedirs <% end -%> [IgnoreNone]