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

diff --git a/manifests/sympa.pp b/manifests/sympa.pp
index 193cd1df47eeadad46a4a7483434848b30356148..2ce336b2e76a2d5b04f609c50b9e5ae1b7426804 100644 (file)
--- 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 d9ee390abd842dc741741eaa28f4042cc0ab885f..7b9e6880dfd4eedc9ee38a5fe8d7aebaf8a915f5 100644 (file)
--- 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"],
+  }
 }