Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  revert RLimitMem for merkel altogether
  up the RLimitMem for hyperestraier
  voltaire doesn't need special handling anymore
  and the right path
  and quotes
  what could possibly go wrong

diff --git a/modules/apache2/templates/ressource-limits.erb b/modules/apache2/templates/ressource-limits.erb
index 66cc046..8ddb673 100644 (file)
--- a/modules/apache2/templates/ressource-limits.erb
+++ b/modules/apache2/templates/ressource-limits.erb
@@ -6,6 +6,7 @@
 RLimitCPU 180
 <%=
 case fqdn
+       when "merkel.debian.org" then "" # maybe unlimited will be better
        when "cimarosa.debian.org" then
                # buildd.debian.org
                "RLimitMEM "+(96 * 1024**2).to_s

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index e0b4ba8..58e69b7 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -140,8 +140,6 @@ host_settings:
   squeeze:
     - fano.debian.org
     - finzi.debian.org
-  smarthost_port:
-    voltaire.debian.org: 25
   smarthost:
     agnesi.debian.org: mailout.debian.org
     agricola.debian.org: mailout.debian.org

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 2e361b5..1d40853 100644 (file)
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -19,6 +19,20 @@ class exim {
           mode    => 755,
           purge   => true
         ;
+        "/etc/exim4/Git":
+          ensure  => directory,
+          purge   => true,
+          force   => true,
+          recurse => true,
+          source  => "puppet:///files/empty/"
+        ;
+        "/etc/exim4/conf.d":
+          ensure  => directory,
+          purge   => true,
+          force   => true,
+          recurse => true,
+          source  => "puppet:///files/empty/"
+        ;
         "/etc/exim4/ssl":
           ensure  => directory,
           owner   => root,