popcon -> hiera role; explicitly include apache2

[mirror/dsa-puppet.git] / modules / roles / manifests / popcon.pp

diff --git a/modules/roles/manifests/popcon.pp b/modules/roles/manifests/popcon.pp
index 080c8d5..1a2866c 100644 (file)
--- a/modules/roles/manifests/popcon.pp
+++ b/modules/roles/manifests/popcon.pp
@@ -1,12 +1,16 @@
 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',
+  }
 }