Disabling mlmmj web interface

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

diff --git a/manifests/web.pp b/manifests/web.pp
index 95aa3b7c3b40b8604bac07802fc1638cba7fe4a0..4d87a09d3773b18e78976de315b423c21f135089 100644 (file)
--- a/manifests/web.pp
+++ b/manifests/web.pp
@@ -119,3 +119,21 @@ class mail::web::mlmmj inherits websites::setup {
                 "puppet:///modules/mail/mlmmj/htpasswd" ],
   }
 }
+
+class mail::web::mlmmj::disabled inherits mail::web:mlmmj {
+  Apache::Site["$mlmmj_subdomain"] {
+    ensure => absent,
+  }
+
+  Package[ 'mlmmj-php-web', 'mlmmj-php-web-admin' ] {
+    ensure => absent,
+  }
+
+  File['/etc/mlmmj-php-web-admin'] {
+    ensure => absent,
+  }
+
+  File['/etc/mlmmj-php-web-admin/htpasswd'] {
+    ensure => absent,
+  }
+}