From: Silvio Rhatto <rhatto@riseup.net>
Date: Wed, 25 Aug 2010 00:38:10 +0000 (-0300)
Subject: Moving sympa web config to mail::web::sympa
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=92f9277f432e73192d67e7146470344fc2ba7c58;p=puppet-mail.git

Moving sympa web config to mail::web::sympa
---

diff --git a/manifests/sympa.pp b/manifests/sympa.pp
index 193cd1d..2ce336b 100644
--- a/manifests/sympa.pp
+++ b/manifests/sympa.pp
@@ -31,18 +31,4 @@ class mail::sympa {
     content => template('mail/sympa/sympa.conf.erb'),
     require => [ File['/etc/sympa'], User['sympa'] ],
   }
-
-  package { [ 'apache2-suexec', 'libapache2-mod-fcgid' ]:
-    ensure => present,
-  }
-
-  apache::module { "fcgid":
-    ensure  => present,
-    require => Package["libapache2-mod-fcgid"],
-  }
-
-  apache::module { "suexec":
-    ensure  => present,
-    require => Package["apache2-suexec"],
-  }
 }
diff --git a/manifests/web.pp b/manifests/web.pp
index d9ee390..7b9e688 100644
--- a/manifests/web.pp
+++ b/manifests/web.pp
@@ -26,4 +26,18 @@ class mail::web::sympa {
     docroot => "${apache_sites_folder}/$sympa_subdomain/site",
     source  => true,
   }
+
+  package { [ 'apache2-suexec', 'libapache2-mod-fcgid' ]:
+    ensure => present,
+  }
+
+  apache::module { "fcgid":
+    ensure  => present,
+    require => Package["libapache2-mod-fcgid"],
+  }
+
+  apache::module { "suexec":
+    ensure  => present,
+    require => Package["apache2-suexec"],
+  }
 }