Merge branch 'master' of git+ssh://zobel@puppet.debian.org/srv/puppet.debian.org...

diff --git a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
index 84e5bc9..e9c8132 100644 (file)
--- a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
+++ b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
@@ -22,7 +22,7 @@ module Puppet::Parser::Functions
     end
 
     if yaml.has_key?('services')
-      ['bugsmaster', 'qamaster', 'mailrelay', 'rtmaster', 'packagesmaster'].each do |service|
+      ['bugsmaster', 'qamaster', 'mailrelay', 'rtmaster', 'packagesmaster', 'packagesqamaster'].each do |service|
         if yaml['services'].has_key?(service)
           results[service] = host == yaml['services'][service]
         end

diff --git a/modules/clamav/manifests/init.pp b/modules/clamav/manifests/init.pp
index f32805d..0be36ab 100644 (file)
--- a/modules/clamav/manifests/init.pp
+++ b/modules/clamav/manifests/init.pp
@@ -2,29 +2,5 @@ class clamav {
     package { "clamav-daemon": ensure => installed;
               "clamav-freshclam": ensure => installed;
     }
-
-    file {
-        "/etc/clamav/clamd.conf":
-          source  => "puppet:///clamav/clamd.conf",
-          require => Package["clamav-daemon"],
-          notify  => Exec["clamav-daemon restart"]
-          ;
-    }
-
-    file {
-        "/etc/clamav/freshclam.conf":
-          source  => "puppet:///clamav/freshclam.conf",
-          require => Package["clamav-freshclam"],
-          notify  => Exec["clamav-freshclam restart"]
-          ;
-    }
-    exec { "clamav-daemon restart":
-        path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-        refreshonly => true,
-    }
-    exec { "clamav-freshclam restart":
-        path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-        refreshonly => true,
-    }
 }
 

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 5f765a1..b1eb4b1 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -85,6 +85,7 @@ services:
   mailrelay: spohr.debian.org
   rtmaster: spohr.debian.org
   packagesmaster: powell.debian.org
+  packagesqamaster: master.debian.org
 mail_port:
   ancina.debian.org: 2025
   allegri.debian.org: 2025

diff --git a/modules/exim/files/common/ccTLD.txt b/modules/exim/files/common/ccTLD.txt
index d04aa8a..c27072a 100644 (file)
--- a/modules/exim/files/common/ccTLD.txt
+++ b/modules/exim/files/common/ccTLD.txt
@@ -1,3 +1,7 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
 2000.hu
 ab.ca
 ab.se

diff --git a/modules/exim/files/common/exim_surbl.pl b/modules/exim/files/common/exim_surbl.pl
index 4f72a14..dd406a5 100644 (file)
--- a/modules/exim/files/common/exim_surbl.pl
+++ b/modules/exim/files/common/exim_surbl.pl
@@ -1,4 +1,8 @@
 #
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+#
 # Copyright (c) 2006-2007 Erik Mugele.  All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/modules/exim/files/common/surbl_whitelist.txt b/modules/exim/files/common/surbl_whitelist.txt
index c3bb723..6708f4f 100644 (file)
--- a/modules/exim/files/common/surbl_whitelist.txt
+++ b/modules/exim/files/common/surbl_whitelist.txt
@@ -1,3 +1,7 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
 example.com
 example.net
 example.org

diff --git a/modules/exim/manifests/mx.pp b/modules/exim/manifests/mx.pp
index 1e77aa9..2f1bfb6 100644 (file)
--- a/modules/exim/manifests/mx.pp
+++ b/modules/exim/manifests/mx.pp
@@ -1,4 +1,7 @@
 class exim::mx inherits exim {
+    include clamav
+    include postgrey
+
     file {
         "/etc/exim4/ccTLD.txt":
           require => Package["exim4-daemon-heavy"],

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index 87cb24b..98d608c 100644 (file)
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -614,7 +614,7 @@ out
 %>
 <%=
 out=''
-if nodeinfo['packagesmaster']
+if nodeinfo['packagesqamaster']
   out='
   warn    domains  = packages.qa.debian.org
           set acl_m1 = PTSMail
@@ -808,7 +808,7 @@ out
 %>
 <%=
 out=''
-if nodeinfo['packagesmaster']
+if nodeinfo['packagesqamaster']
   out='
   deny    !hosts  = +debianhosts : 217.196.43.134
           condition = ${if eq {$acl_m1}{PTSMail}}

diff --git a/modules/postgrey/files/default b/modules/postgrey/files/default
new file mode 100644 (file)
index 0000000..c520236
--- /dev/null
+++ b/modules/postgrey/files/default
@@ -0,0 +1,21 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+#
+# postgrey startup options, created for Debian
+# (c)2004 Adrian von Bidder <avbidder@fortytwo.ch>
+# Distribute and/or modify at will.
+
+# you may want to set
+#   --delay=N   how long to greylist, seconds (default: 300)
+#   --max-age=N delete old entries after N days (default: 30)
+# see also the postgrey(8) manpage
+
+#POSTGREY_OPTS="--inet=127.0.0.1:60000"
+
+# the --greylist-text commandline argument can not be easily passed through
+# POSTGREY_OPTS when it contains spaces.  So, insert your text here:
+#POSTGREY_TEXT="Your customized rejection message here"
+POSTGREY_OPTS="--unix=/var/run/postgrey/socket --retry-window=4 --auto-whitelist-clients=10 --exim"
+[ -d /var/run/postgrey ] || (mkdir /var/run/postgrey && chown postgrey:Debian-exim /var/run/postgrey && chmod 750 /var/run/postgrey)

diff --git a/modules/postgrey/manifests/init.pp b/modules/postgrey/manifests/init.pp
index fd735b9..bc42e86 100644 (file)
--- a/modules/postgrey/manifests/init.pp
+++ b/modules/postgrey/manifests/init.pp
@@ -3,7 +3,7 @@ class postgrey {
 
     file {
         "/etc/default/postgrey":
-          source  => "puppet:///exim/common/postgrey-default",
+          source  => "puppet:///postgrey/default",
           require => Package["postgrey"],
           notify  => Exec["postgrey restart"]
           ;

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index a46a94e..e9ce52f 100644 (file)
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -252,6 +252,7 @@ file=/etc/apt/apt.conf.d/local-recommends
 file=/etc/apt/apt.conf.d/local-pdiffs
 file=/etc/puppet/puppet.conf
 file=/etc/default/puppet
+file=/etc/default/postgrey
 file=/etc/logrotate.d/exim4-paniclog
 file=/etc/logrotate.d/exim4-base
 file=/etc/logrotate.d/syslog-ng