old-style roles are gone

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

diff --git a/modules/roles/manifests/nm.pp b/modules/roles/manifests/nm.pp
index 3a8ee2f..cceb28d 100644 (file)
--- a/modules/roles/manifests/nm.pp
+++ b/modules/roles/manifests/nm.pp
@@ -1,6 +1,14 @@
 class roles::nm {
-       ssl::service { 'nm.debian.org':
-               notify  => Exec['service apache2 reload'],
-               key => true,
-       }
+  include apache2
+  include roles::sso_rp
+
+  ssl::service { 'nm.debian.org':
+    notify => Exec['service apache2 reload'],
+    key    => true,
+  }
+
+  exim::vdomain { 'nm.debian.org':
+    owner => 'nm',
+    group => 'nm',
+  }
 }