X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=0470b644b5fe0751c9b5ef8d7442a9e77c70c475;hb=bfc9d666d8733a5e53b8d0d351760a13b8c332eb;hp=b14d408d732709a54130e57ec24cd3ae5549a035;hpb=f833a1c122597f80da4d4095cae8d7d5bd852a7a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index b14d408d7..0470b644b 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -1,3 +1,11 @@
+# = Class: apache2
+#
+# Standard apache config debian.org hosts
+#
+# == Sample Usage:
+#
+#   include apache2
+#
 class apache2 {
 	package { 'apache2':
 		ensure => installed,
@@ -33,14 +41,16 @@ class apache2 {
 		ensure => absent,
 	}
 
-	if $::fqdn in $site::roles['buildd_master'] {
-		$memlimit = 192 * 1024**2
-	} elsif $::fqdn in $site::roles['nagiosmaster']{
-		$memlimit = 96 * 1024**2
-	} elsif $::fqdn in $site::roles['packagesqamaster']{
-		$memlimit = 192 * 1024**2
+	if has_role('buildd_master') {
+		$memlimit = 192 * 1024 * 1024
+	} elsif has_role('nagiosmaster') {
+		$memlimit = 96 * 1024 * 1024
+	} elsif has_role('packagesqamaster') {
+		$memlimit = 192 * 1024 * 1024
+	} elsif has_role('nm') {
+		$memlimit = 96 * 1024 * 1024
 	} else {
-		$memlimit = 32 * 1024**2
+		$memlimit = 32 * 1024 * 1024
 	}
 
 	apache2::config { 'resource-limits':