X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=ddc9e3861e7644eb7374dc68f33b5cacdefccd80;hb=05bfa391748bf827189c42c1a79694ca4cef28c3;hp=9ba82ada50833130573087720cf98b6752af86c4;hpb=1821dd249668dfe13c4eff3d68f6eaa42dda72e5;p=mirror%2Fdsa-puppet.git diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb index 9ba82ada5..ddc9e3861 100644 --- a/modules/samhain/templates/samhainrc.erb +++ b/modules/samhain/templates/samhainrc.erb @@ -110,6 +110,10 @@ 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 # # There are files in /etc that might change, thus changing the directory @@ -120,11 +124,16 @@ 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 +<% if classes.include?("apache2") -%> +file=/etc/apache2/conf-available files=/etc/apache2/mods-enabled files=/etc/apache2/sites-available +<% end -%> file=/etc/bacula file=/etc/samhain file=/etc/munin @@ -170,6 +179,13 @@ file=/etc/rabbitmq file=/etc/ssh/userkeys file=/etc/ssh/userkeys/staticsync <% end -%> +file=/etc/rsyncd +<%- if @hostname == "sibelius" then -%> +file=/etc/tsm +file=/etc/tsm/TSM.PWD +<% end -%> +file=/etc/ssl/private + [LogFiles] ## @@ -227,6 +243,7 @@ file=/var/log/syslog [IgnoreAll] +dir=-1/srv ## ## for these files, no modifications are reported ## @@ -235,6 +252,8 @@ file=/var/log/syslog file=/etc/resolv.conf <% if scope.lookupvar('site::nodeinfo')['buildd'] -%> file=/etc/dupload.conf +file=/etc/buildd/buildd.conf +file=/etc/sbuild/sbuild.conf <% end -%> file=/etc/resolv.conf.pcmcia.save file=/etc/nologin @@ -368,8 +387,8 @@ 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 @@ -384,6 +403,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,16 +425,15 @@ 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 file=/etc/monit/monit.d/01puppet 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 +file=/etc/schroot/setup.d/99builddsourceslist file=/etc/schroot/setup.d/99porterbox-extra-sources file=/etc/schroot/setup.d/99porterbox-extra-apt-options file=/etc/openvswitch/conf.db @@ -450,12 +469,20 @@ dir=3/etc/facter file=/etc/ferm/conf.d/me.conf file=/etc/ferm/conf.d/defs.conf file=/etc/ferm/ferm.conf +file=/etc/ssl/README dir=2/etc/ssl/debian dir=1/etc/ssl/certs +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 -%> +file=/etc/rsyncd/debian.secrets <% if scope.function_has_role(['puppetmaster']) %> @@ -471,6 +498,7 @@ dir=1/usr/share/puppet-dashboard/tmp/pids <% if classes.include?("porterbox") %> file=/etc/cron.weekly/puppet-mail-big-homedirs <% end -%> +file=/etc/ssl/private/*.key-certchain [IgnoreNone] ## @@ -636,14 +664,14 @@ SyslogSeverity=alert # ##################################################### -# [SuidCheck] +[SuidCheck] ## ## --- Check the filesystem for SUID/SGID binaries ## -## Switch on +## Switch off # -# SuidCheckActive = yes +SuidCheckActive = 0 ## Interval for check (seconds) # @@ -808,6 +836,11 @@ SyslogSeverity=alert # # SetDefault = no +<% if scope.call_function('versioncmp', [@lsbmajdistrelease, '9']) >= 0 -%> +[PortCheck] +PortCheckActive=0 +<% end -%> + ##################################################### # @@ -913,7 +946,7 @@ SetMailNum = 10 ## Recipient (max. 8) # -SetMailAddress=samhain-reports@<%= fqdn -%> +SetMailAddress=samhain-reports@<%= @fqdn -%> SetMailRelay = localhost