summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-08-24 21:38:10 -0300
committerSilvio Rhatto <rhatto@riseup.net>2010-08-24 21:38:10 -0300
commit92f9277f432e73192d67e7146470344fc2ba7c58 (patch)
treeee94921fad9b51dfd6363c127897a9f2caca7300
parentecc08c17d1d5b74a7d4294c7c576beb8fbca337b (diff)
downloadpuppet-mail-92f9277f432e73192d67e7146470344fc2ba7c58.tar.gz
puppet-mail-92f9277f432e73192d67e7146470344fc2ba7c58.tar.bz2
Moving sympa web config to mail::web::sympa
-rw-r--r--manifests/sympa.pp14
-rw-r--r--manifests/web.pp14
2 files changed, 14 insertions, 14 deletions
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"],
+ }
}