Adding mail::web

diff --git a/manifests/init.pp b/manifests/init.pp
index d0359ddb627988c6fa0be539c31b395b07f9dfa9..2f32cfb275f6f0357236382005e735317f57b074 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -10,3 +10,4 @@ import "postfixadmin"
 import "sasl.pp"
 import "tls.pp"
 import "amavisd.pp"
+import "web.pp"

diff --git a/manifests/postfixadmin.pp b/manifests/postfixadmin.pp
index 7156bd3545c360c163dc4b8dcc08add3eb506907..25462250ff8792616b664afc63efe8b447d7a922 100644 (file)
--- a/manifests/postfixadmin.pp
+++ b/manifests/postfixadmin.pp
@@ -6,12 +6,6 @@ class mail::postfixadmin {
     password => "$postfixadmin_password",
   }
 
-  # Web configuration
-  apache::site { "postfixadmin":
-    docroot => "${apache_sites_folder}/postfixadmin/site",
-    use     => [ "Site postfixadmin" ],
-  }
-
   #
   # Postfix configuration
   #

diff --git a/manifests/system.pp b/manifests/system.pp
index ae5b2ed15cacaaa121cf6552f782dfc9ebe0d85f..3e39d68529dfe299b90d9898b79607b2f8ac7338 100644 (file)
--- a/manifests/system.pp
+++ b/manifests/system.pp
@@ -27,7 +27,6 @@ class mail::system {
   include postfix
   include database
   include ssl::mail
-  include websites::setup
 
   # Subsystems
   include mail::packages
@@ -37,6 +36,7 @@ class mail::system {
   include mail::amavisd
   include mail::header_checks
   include mail::postfixadmin
+  include mail::web
 
   # Postfix configuration
   postfix::config {

diff --git a/manifests/web.pp b/manifests/web.pp
new file mode 100644 (file)
index 0000000..9783a71
--- /dev/null
+++ b/manifests/web.pp
@@ -0,0 +1,11 @@
+class mail::web inherits websites::setup {
+  apache::site { "postfixadmin":
+    docroot => "${apache_sites_folder}/postfixadmin/site",
+    use     => [ "Site postfixadmin" ],
+  }
+
+  apache::site { "mail":
+    docroot => "/usr/share/squirrelmail",
+    source  => true,
+  }
+}