From: Tollef Fog Heen <tfheen@err.no>
Date: Sun, 15 Sep 2013 10:23:21 +0000 (+0200)
Subject: s/ressource/resource/
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=03ca468e0bdcc5c8ee4828fd3c320fe9e5f66c52;p=mirror%2Fdsa-puppet.git

s/ressource/resource/
---

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 16807bb81..dec3162d6 100644
--- 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
index 000000000..48875e54f
--- /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
index 48875e54f..000000000
--- 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 61234f21a..7d57f4c5d 100644
--- 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