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:
  Ignore /etc/apache2/conf.d/ressource-limits
  set apache ressource limits (RT#1481)
  more hosts use default buildd software
  lebrun becomes standard buildd

diff --git a/modules/apache2/files/common/etc/apache2/conf.d/ressource-limits b/modules/apache2/files/common/etc/apache2/conf.d/ressource-limits
new file mode 100644 (file)
index 0000000..7baabd1
--- /dev/null
+++ b/modules/apache2/files/common/etc/apache2/conf.d/ressource-limits
@@ -0,0 +1,3 @@
+RLimitCPU 180
+RLimitMEM 33554432
+RLimitNPROC 128

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 5283098605843db40c1155dbb43ab231ebceb8c1..a0af075b0ef88d2bbfbd09dff293962fd1432936 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -5,6 +5,11 @@ class apache2 {
        }
 
        file {
+               "/etc/apache2/conf.d/ressource-limits":
+                       source  => [ "puppet:///apache2/per-host/$fqdn/etc/apache2/conf.d/ressource-limits",
+                                    "puppet:///apache2/common/etc/apache2/conf.d/ressource-limits" ],
+                       require => Package["apache2"],
+                       notify  => Exec["apache2 reload"];
                "/etc/apache2/conf.d/security":
                        source  => [ "puppet:///apache2/per-host/$fqdn/etc/apache2/conf.d/security",
                                     "puppet:///apache2/common/etc/apache2/conf.d/security" ],

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 1d906f36b0d76e386034d9a7b63adca7179f4bcb..693d05e6fb647b4a3be01d42606debe1a23eee2e 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -143,6 +143,11 @@ host_settings:
     - paer.debian.org
     - praetorius.debian.org
     - puccini.debian.org
+    - lebrun.debian.org
+    - spontini.debian.org
+    - schroeder.debian.org
+    - mayer.debian.org
+    - rem.debian.org
   smarthost:
     allegri.debian.org: mailout.debian.org
     ancina.debian.org: mailout.debian.org

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index bbf3e7d1a1b488d3be030f93d522a99e11aeb893..b4ff18ee79883cb793af47cf30fea7f03eeb8cb0 100644 (file)
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -134,6 +134,7 @@ file=/etc/bind/zones
 file=/etc/spamassassin/sa-update-keys
 
 # These are the directories for the files we handle with puppet
+file=/etc/apache2/conf.d
 file=/etc/samhain
 file=/etc/munin
 file=/etc/exim4
@@ -280,6 +281,7 @@ file=/etc/clamav-unofficial-sigs.dsa.conf
 end
 out
 %>
+file=/etc/apache2/conf.d/ressource-limits
 file=/etc/apt/preferences
 file=/etc/apt/sources.list.d/volatile.list
 file=/etc/apt/sources.list.d/security.list