s/ressource/resource/

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 16807bb810b5d9a07afcc68890bc5ff5f577a912..dec3162d6d6a3c2873145bd169c42806a77c7ff4 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -22,7 +22,11 @@ class apache2 {
        }
 
        apache2::config { 'ressource-limits':
-               content => template('apache2/ressource-limits.erb'),
+               ensure => absent,
+       }
+
+       apache2::config { 'resource-limits':
+               content => template('apache2/resource-limits.erb'),
        }
 
        apache2::config { 'security':

diff --git a/modules/apache2/templates/resource-limits.erb b/modules/apache2/templates/resource-limits.erb
new file mode 100644 (file)
index 0000000..48875e5
--- /dev/null
+++ b/modules/apache2/templates/resource-limits.erb
@@ -0,0 +1,22 @@
+##
+## 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
+##
+
+RLimitCPU 180
+<%=
+if scope.lookupvar('site::nodeinfo')['buildd_master'] then
+                       # buildd.debian.org
+                       "RLimitMEM "+(96 * 1024**2).to_s
+else
+       case fqdn
+               when "berlioz.debian.org" then
+                       ""
+               when "tchaikovsky.debian.org" then
+                       "RLimitMEM "+(96 * 1024**2).to_s
+               else
+                       "RLimitMEM "+(32 * 1024**2).to_s
+       end
+end
+%>
+RLimitNPROC 128

diff --git a/modules/apache2/templates/ressource-limits.erb b/modules/apache2/templates/ressource-limits.erb
deleted file mode 100644 (file)
index 48875e5..0000000
--- a/modules/apache2/templates/ressource-limits.erb
+++ /dev/null
@@ -1,22 +0,0 @@
-##
-## 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
-##
-
-RLimitCPU 180
-<%=
-if scope.lookupvar('site::nodeinfo')['buildd_master'] then
-                       # buildd.debian.org
-                       "RLimitMEM "+(96 * 1024**2).to_s
-else
-       case fqdn
-               when "berlioz.debian.org" then
-                       ""
-               when "tchaikovsky.debian.org" then
-                       "RLimitMEM "+(96 * 1024**2).to_s
-               else
-                       "RLimitMEM "+(32 * 1024**2).to_s
-       end
-end
-%>
-RLimitNPROC 128

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 61234f21a94302811ea829be7fc0f85fc786db3d..7d57f4c5d9f26beaf0054199512ca56963312834 100644 (file)
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -332,7 +332,7 @@ file=/etc/munin/plugins/exim_mailqueue
 file=/etc/munin/plugins/exim_mailstats
 file=/etc/munin/plugins/postfix_mailqueue
 file=/etc/munin/plugins/postfix_mailvolume
-file=/etc/apache2/conf.d/ressource-limits
+file=/etc/apache2/conf.d/resource-limits
 file=/etc/apache2/mods-enabled/info.conf
 file=/etc/apache2/mods-enabled/info.load
 file=/etc/apache2/mods-enabled/server.conf