From 03ca468e0bdcc5c8ee4828fd3c320fe9e5f66c52 Mon Sep 17 00:00:00 2001 From: Tollef Fog Heen Date: Sun, 15 Sep 2013 12:23:21 +0200 Subject: [PATCH] s/ressource/resource/ --- modules/apache2/manifests/init.pp | 6 +++++- .../templates/{ressource-limits.erb => resource-limits.erb} | 0 modules/samhain/templates/samhainrc.erb | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) rename modules/apache2/templates/{ressource-limits.erb => resource-limits.erb} (100%) 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/ressource-limits.erb b/modules/apache2/templates/resource-limits.erb similarity index 100% rename from modules/apache2/templates/ressource-limits.erb rename to modules/apache2/templates/resource-limits.erb 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 -- 2.20.1