Adding mail::web::mlmmj

diff --git a/manifests/mlmmj.pp b/manifests/mlmmj.pp
index b9da73afcbd3ec72408330925aa60ca4aa9a8d78..bada09ef5a2e1da506aff3fa3acef7a2cc81e568 100644 (file)
--- a/manifests/mlmmj.pp
+++ b/manifests/mlmmj.pp
@@ -1,5 +1,6 @@
 class mail::mlmmj {
   include mail::packages::mlmmj
+  include mail::web::mlmmj
 
   group { 'mlmmj':
     ensure => present,

diff --git a/manifests/web.pp b/manifests/web.pp
index be84a2523afb5c54f286c267bd1c7cfd0a6fc29d..a97ffb5d6e5b731c2516c0176bebedf65c78b392 100644 (file)
--- a/manifests/web.pp
+++ b/manifests/web.pp
@@ -87,3 +87,20 @@ class mail::web::sympa::disabled inherits mail::web::sympa {
     require => undef,
   }
 }
+
+class mail::web::mlmmj inherits websites::setup {
+  apache::site { "$mlmmj_subdomain":
+    docroot     => "/usr/share/mlmmj-php-web-admin",
+    source      => true,
+    owner       => 'mlmmj',
+    group       => 'mlmmj',
+    mpm_user    => 'mlmmj',
+    mpm_group   => 'mlmmj',
+    manage_user => false,
+    require     => Package['mlmmj-php-web-admin'],
+  }
+
+  package { [ 'mlmmj-php-web', 'mlmmj-php-web-admin' ]:
+    ensure => present,
+  }
+}