summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/mlmmj.pp2
-rw-r--r--manifests/web.pp18
2 files changed, 19 insertions, 1 deletions
diff --git a/manifests/mlmmj.pp b/manifests/mlmmj.pp
index bada09e..52b9bd0 100644
--- 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 95aa3b7..4d87a09 100644
--- 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,
+ }
+}