X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fpopcon.pp;h=1a7892dde8e76a2427c93d8f1734eb1cc6b4d947;hb=a7d417cca7d5ad27c47c2c4627dae06c74b20222;hp=080c8d5a1ecd4721b306c10075f6bf169b5ef145;hpb=38e8fb687f0cb0f66d5a58d42e1f706b9d4c42e1;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/popcon.pp b/modules/roles/manifests/popcon.pp
index 080c8d5a1..1a7892dde 100644
--- a/modules/roles/manifests/popcon.pp
+++ b/modules/roles/manifests/popcon.pp
@@ -1,12 +1,21 @@
 class roles::popcon {
-	ssl::service { 'popcon.debian.org':
-		notify  => Exec['service apache2 reload'],
-		key => true,
-	}
+  class { 'apache2':
+    rlimitmem => 512 * 1024 * 1024,
+  }
 
-	include apache2::ssl
-	apache2::site { 'popcon.debian.org':
-		site => 'popcon.debian.org',
-		source => 'puppet:///modules/roles/popcon/popcon.debian.org.conf',
-	}
+  include apache2::ssl
+
+  ssl::service { 'popcon.debian.org':
+    notify => Exec['service apache2 reload'],
+    key    => true,
+  }
+  apache2::site { 'popcon.debian.org':
+    site   => 'popcon.debian.org',
+    source => 'puppet:///modules/roles/popcon/popcon.debian.org.conf',
+  }
+
+  exim::vdomain { 'popcon.debian.org':
+    owner => 'popcon',
+    group => 'popcon',
+  }
 }